diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-08 15:59:17 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-08 15:59:17 +0000 |
| commit | 9832c911b36f25f228e391c6da876f79b664af0e (patch) | |
| tree | 076c1fb815e638ca8ac4d6f287865e9c8e547b21 /src/lib/openjpip/j2kheader_manager.c | |
| parent | 23f5eeec20e853c5534df735d9263befda9b0135 (diff) | |
[trunk] Update JPIP (FolderReorgProposal task)
This commit does three things:
- Use opj_malloc/calloc/free instead of the default C ones.
- Update JPIP API to start using cio _v2 API
- Create a new opj_jpip_compress which is the replacement for image_to_j2k -jpip
Update issue 177
Diffstat (limited to 'src/lib/openjpip/j2kheader_manager.c')
| -rw-r--r-- | src/lib/openjpip/j2kheader_manager.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/openjpip/j2kheader_manager.c b/src/lib/openjpip/j2kheader_manager.c index 5a6054cc..b61da5ef 100644 --- a/src/lib/openjpip/j2kheader_manager.c +++ b/src/lib/openjpip/j2kheader_manager.c @@ -127,8 +127,8 @@ CODmarker_param_t get_CODmkrdata_from_j2kstream( Byte_t *CODstream) COD.numOfdecomp = *( CODstream+7); if(COD.Scod & 0x01){ - COD.XPsiz = (Byte4_t *)malloc( (OPJ_SIZE_T)(COD.numOfdecomp+1)*sizeof(Byte4_t)); - COD.YPsiz = (Byte4_t *)malloc( (OPJ_SIZE_T)(COD.numOfdecomp+1)*sizeof(Byte4_t)); + COD.XPsiz = (Byte4_t *)opj_malloc( (OPJ_SIZE_T)(COD.numOfdecomp+1)*sizeof(Byte4_t)); + COD.YPsiz = (Byte4_t *)opj_malloc( (OPJ_SIZE_T)(COD.numOfdecomp+1)*sizeof(Byte4_t)); for( i=0; i<=COD.numOfdecomp; i++){ /*precinct size */ @@ -137,8 +137,8 @@ CODmarker_param_t get_CODmkrdata_from_j2kstream( Byte_t *CODstream) } } else{ - COD.XPsiz = (Byte4_t *)malloc( sizeof(Byte4_t)); - COD.YPsiz = (Byte4_t *)malloc( sizeof(Byte4_t)); + COD.XPsiz = (Byte4_t *)opj_malloc( sizeof(Byte4_t)); + COD.YPsiz = (Byte4_t *)opj_malloc( sizeof(Byte4_t)); COD.XPsiz[0] = COD.YPsiz[0] = pow(2,15); } return COD; |