diff options
Diffstat (limited to 'libopenjpeg/dwt.h')
| -rw-r--r-- | libopenjpeg/dwt.h | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/libopenjpeg/dwt.h b/libopenjpeg/dwt.h index 3b833391..88308164 100644 --- a/libopenjpeg/dwt.h +++ b/libopenjpeg/dwt.h @@ -52,49 +52,36 @@ Forward 5-3 wavelet tranform in 2-D. Apply a reversible DWT transform to a component of an image. @param tilec Tile component information (current tile) */ -opj_bool dwt_encode_v2(struct opj_tcd_tilecomp_v2 * tilec); +opj_bool opj_dwt_encode(opj_tcd_tilecomp_v2_t * tilec); /** -Forward 5-3 wavelet tranform in 2-D. -Apply a reversible DWT transform to a component of an image. -@param tilec Tile component information (current tile) -*/ -void dwt_encode(opj_tcd_tilecomp_t * tilec); -/** Inverse 5-3 wavelet tranform in 2-D. 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); - -opj_bool dwt_decode_v2(opj_tcd_tilecomp_v2_t* tilec, OPJ_UINT32 numres); +opj_bool opj_dwt_decode(opj_tcd_tilecomp_v2_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) @return Returns 0 if orient = 0, returns 1 if orient = 1 or 2, returns 2 otherwise */ -int dwt_getgain(int orient); - -OPJ_UINT32 dwt_getgain_v2(OPJ_UINT32 orient) ; +OPJ_UINT32 opj_dwt_getgain(OPJ_UINT32 orient) ; /** Get the norm of a wavelet function of a subband at a specified level for the reversible 5-3 DWT. @param level Level of the wavelet function @param orient Band of the wavelet function @return Returns the norm of the wavelet function */ -double dwt_getnorm(int level, int orient); +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. Apply an irreversible DWT transform to a component of an image. @param tilec Tile component information (current tile) */ -void dwt_encode_real(opj_tcd_tilecomp_t * tilec); -opj_bool dwt_encode_real_v2(opj_tcd_tilecomp_v2_t * tilec); +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. @@ -112,8 +99,7 @@ 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) @return Returns the gain of the 9-7 wavelet transform */ -int dwt_getgain_real(int orient); -OPJ_UINT32 dwt_getgain_real_v2(OPJ_UINT32 orient); +OPJ_UINT32 opj_dwt_getgain_real(OPJ_UINT32 orient); /** Get the norm of a wavelet function of a subband at a specified level for the irreversible 9-7 DWT @param level Level of the wavelet function @@ -121,12 +107,13 @@ Get the norm of a wavelet function of a subband at a specified level for the irr @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 @param tccp Tile-component coding parameters @param prec Precint analyzed */ -void dwt_calc_explicit_stepsizes(opj_tccp_t * tccp, int prec); +void opj_dwt_calc_explicit_stepsizes(opj_tccp_t * tccp, OPJ_UINT32 prec); /* ----------------------------------------------------------------------- */ /*@}*/ |