WIP: enchance the new version with some bug fixes from v1 and from me

[openjpeg.git] / libopenjpeg / dwt.h

diff --git a/libopenjpeg/dwt.h b/libopenjpeg/dwt.h
index adf73e544006a9116559e629eadbd9dc7ffccd0f..303fac1c662d0ea5802bb03390afa8677e66df15 100644 (file)
--- a/libopenjpeg/dwt.h
+++ b/libopenjpeg/dwt.h
@@ -59,7 +59,12 @@ Apply a reversible inverse DWT transform to a component of an image.
 @param tilec Tile component information (current tile)
 @param numres Number of resolution levels to decode
 */
+#ifdef OPJ_V1
 void dwt_decode(opj_tcd_tilecomp_t* tilec, int numres);
+#endif
+opj_bool dwt_decode(opj_tcd_tilecomp_t* tilec, OPJ_UINT32 numres);
+
+
 /**
 Get the gain of a subband for the reversible 5-3 DWT.
 @param orient Number that identifies the subband (0->LL, 1->HL, 2->LH, 3->HH)
@@ -80,12 +85,14 @@ Apply an irreversible DWT transform to a component of an image.
 */
 void dwt_encode_real(opj_tcd_tilecomp_t * tilec);
 /**
+KEEP TRUNK VERSION + return type of v2 because rev557
 Inverse 9-7 wavelet transform in 2-D. 
 Apply an irreversible inverse DWT transform to a component of an image.
 @param tilec Tile component information (current tile)
 @param numres Number of resolution levels to decode
 */
-void dwt_decode_real(opj_tcd_tilecomp_t* tilec, int numres);
+// V1 void dwt_decode_real(opj_tcd_tilecomp_t* tilec, int numres);
+opj_bool dwt_decode_real(opj_tcd_tilecomp_t* tilec, int numres);
 /**
 Get the gain of a subband for the irreversible 9-7 DWT.
 @param orient Number that identifies the subband (0->LL, 1->HL, 2->LH, 3->HH)