Work In Progress: insert elements from V2 framework into the trunk

This commit is contained in:
Mickael Savinaud
2011-09-19 13:04:04 +00:00
parent 93f3e2b007
commit b551844cc2
30 changed files with 8815 additions and 231 deletions

View File

@@ -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)