diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-10-24 09:29:34 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-10-24 09:29:34 +0000 |
| commit | 216791c3fb2858bc32159d70e917b4abae47e000 (patch) | |
| tree | 684ff395eddccf5537bf1928e71021553e72ffc0 /src/lib/openjp2/dwt.h | |
| parent | 12c4e680580f5a246a7a5b3993cfadbbffbd0e9d (diff) | |
[trunk] Finalize dwt.v/.h with the v2 style : remove last functions already optimized, add opj_ prefix, use new name of the functions
Diffstat (limited to 'src/lib/openjp2/dwt.h')
| -rw-r--r-- | src/lib/openjp2/dwt.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/lib/openjp2/dwt.h b/src/lib/openjp2/dwt.h index 88308164..a6c98d31 100644 --- a/src/lib/openjp2/dwt.h +++ b/src/lib/openjp2/dwt.h @@ -74,7 +74,6 @@ Get the norm of a wavelet function of a subband at a specified level for the rev @param orient Band of the wavelet function @return Returns the norm of the wavelet function */ -double dwt_getnorm(int level, int orient); /* TODO REMOVE IT*/ OPJ_FLOAT64 opj_dwt_getnorm(OPJ_UINT32 level, OPJ_UINT32 orient); /** Forward 9-7 wavelet transform in 2-D. @@ -83,16 +82,12 @@ Apply an irreversible DWT transform to a component of an image. */ opj_bool opj_dwt_encode_real(opj_tcd_tilecomp_v2_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 */ -/* V1 void dwt_decode_real(opj_tcd_tilecomp_t* tilec, int numres); */ -opj_bool dwt_decode_real(opj_tcd_tilecomp_t* tilec, int numres); - -opj_bool dwt_decode_real_v2(opj_tcd_tilecomp_v2_t* restrict tilec, OPJ_UINT32 numres); +opj_bool opj_dwt_decode_real(opj_tcd_tilecomp_v2_t* restrict tilec, OPJ_UINT32 numres); /** Get the gain of a subband for the irreversible 9-7 DWT. @@ -106,7 +101,6 @@ Get the norm of a wavelet function of a subband at a specified level for the irr @param orient Band of the wavelet function @return Returns the norm of the 9-7 wavelet */ -double dwt_getnorm_real(int level, int orient); OPJ_FLOAT64 opj_dwt_getnorm_real(OPJ_UINT32 level, OPJ_UINT32 orient); /** Explicit calculation of the Quantization Stepsizes |