X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fopenjp2%2Ftcd.c;h=a58cf47e758a5b6443348b63441c007668c21b7d;hb=ffad2fbe55d9df5cd51ba230a47d8a87b277be31;hp=6d5706fbe59ce2ac14f16ab1cb4a8489b4b39b18;hpb=4b140e060bf1a5cd1cc048014bc9e512930e2a8d;p=openjpeg.git diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c index 6d5706fb..a58cf47e 100644 --- a/src/lib/openjp2/tcd.c +++ b/src/lib/openjp2/tcd.c @@ -6,6 +6,8 @@ * Copyright (c) 2003-2007, Francois-Olivier Devaux and Antonin Descampe * Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2006-2007, Parvatha Elangovan + * Copyright (c) 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France + * Copyright (c) 2012, CS Systemes d'Information, France * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -34,7 +36,8 @@ /* ----------------------------------------------------------------------- */ - +/* TODO MSD: */ +#ifdef TODO_MSD void tcd_dump(FILE *fd, opj_tcd_t *tcd, opj_tcd_image_t * img) { int tileno, compno, resno, bandno, precno;/*, cblkno;*/ @@ -93,64 +96,65 @@ void tcd_dump(FILE *fd, opj_tcd_t *tcd, opj_tcd_image_t * img) { } fprintf(fd, "}\n"); } +#endif /** * Allocates memory for a decoding code block. */ -static opj_bool opj_tcd_code_block_dec_allocate (opj_tcd_cblk_dec_v2_t * p_code_block); +static OPJ_BOOL opj_tcd_code_block_dec_allocate (opj_tcd_cblk_dec_t * p_code_block); /** * Deallocates the decoding data of the given precinct. */ -static void opj_tcd_code_block_dec_deallocate (opj_tcd_precinct_v2_t * p_precinct); +static void opj_tcd_code_block_dec_deallocate (opj_tcd_precinct_t * p_precinct); /** * Allocates memory for an encoding code block. */ -static opj_bool opj_tcd_code_block_enc_allocate (opj_tcd_cblk_enc_v2_t * p_code_block); +static OPJ_BOOL opj_tcd_code_block_enc_allocate (opj_tcd_cblk_enc_t * p_code_block); /** * Deallocates the encoding data of the given precinct. */ -static void opj_tcd_code_block_enc_deallocate (opj_tcd_precinct_v2_t * p_precinct); +static void opj_tcd_code_block_enc_deallocate (opj_tcd_precinct_t * p_precinct); /** Free the memory allocated for encoding @param tcd TCD handle */ -static void opj_tcd_free_tile(opj_tcd_v2_t *tcd); +static void opj_tcd_free_tile(opj_tcd_t *tcd); -static opj_bool opj_tcd_t2_decode ( opj_tcd_v2_t *p_tcd, +static OPJ_BOOL opj_tcd_t2_decode ( opj_tcd_t *p_tcd, OPJ_BYTE * p_src_data, OPJ_UINT32 * p_data_read, OPJ_UINT32 p_max_src_size, opj_codestream_index_t *p_cstr_index ); -static opj_bool opj_tcd_t1_decode (opj_tcd_v2_t *p_tcd); +static OPJ_BOOL opj_tcd_t1_decode (opj_tcd_t *p_tcd); -static opj_bool opj_tcd_dwt_decode (opj_tcd_v2_t *p_tcd); +static OPJ_BOOL opj_tcd_dwt_decode (opj_tcd_t *p_tcd); -static opj_bool opj_tcd_mct_decode (opj_tcd_v2_t *p_tcd); +static OPJ_BOOL opj_tcd_mct_decode (opj_tcd_t *p_tcd); -static opj_bool opj_tcd_dc_level_shift_decode (opj_tcd_v2_t *p_tcd); +static OPJ_BOOL opj_tcd_dc_level_shift_decode (opj_tcd_t *p_tcd); -static opj_bool opj_tcd_dc_level_shift_encode ( opj_tcd_v2_t *p_tcd ); +static OPJ_BOOL opj_tcd_dc_level_shift_encode ( opj_tcd_t *p_tcd ); -static opj_bool opj_tcd_mct_encode ( opj_tcd_v2_t *p_tcd ); +static OPJ_BOOL opj_tcd_mct_encode ( opj_tcd_t *p_tcd ); -static opj_bool opj_tcd_dwt_encode ( opj_tcd_v2_t *p_tcd ); +static OPJ_BOOL opj_tcd_dwt_encode ( opj_tcd_t *p_tcd ); -static opj_bool opj_tcd_t1_encode ( opj_tcd_v2_t *p_tcd ); +static OPJ_BOOL opj_tcd_t1_encode ( opj_tcd_t *p_tcd ); -static opj_bool opj_tcd_t2_encode ( opj_tcd_v2_t *p_tcd, +static OPJ_BOOL opj_tcd_t2_encode ( opj_tcd_t *p_tcd, OPJ_BYTE * p_dest_data, OPJ_UINT32 * p_data_written, OPJ_UINT32 p_max_dest_size, opj_codestream_info_t *p_cstr_info ); -static opj_bool opj_tcd_rate_allocate_encode( opj_tcd_v2_t *p_tcd, +static OPJ_BOOL opj_tcd_rate_allocate_encode( opj_tcd_t *p_tcd, OPJ_BYTE * p_dest_data, OPJ_UINT32 p_max_dest_size, opj_codestream_info_t *p_cstr_info ); @@ -160,25 +164,25 @@ static opj_bool opj_tcd_rate_allocate_encode( opj_tcd_v2_t *p_tcd, /** Create a new TCD handle */ -opj_tcd_v2_t* opj_tcd_create(opj_bool p_is_decoder) +opj_tcd_t* opj_tcd_create(OPJ_BOOL p_is_decoder) { - opj_tcd_v2_t *l_tcd = 00; + opj_tcd_t *l_tcd = 00; /* create the tcd structure */ - l_tcd = (opj_tcd_v2_t*) opj_malloc(sizeof(opj_tcd_v2_t)); + l_tcd = (opj_tcd_t*) opj_malloc(sizeof(opj_tcd_t)); if (!l_tcd) { return 00; } - memset(l_tcd,0,sizeof(opj_tcd_v2_t)); + memset(l_tcd,0,sizeof(opj_tcd_t)); l_tcd->m_is_decoder = p_is_decoder ? 1 : 0; - l_tcd->tcd_image = (opj_tcd_image_v2_t*)opj_malloc(sizeof(opj_tcd_image_v2_t)); + l_tcd->tcd_image = (opj_tcd_image_t*)opj_malloc(sizeof(opj_tcd_image_t)); if (!l_tcd->tcd_image) { opj_free(l_tcd); return 00; } - memset(l_tcd->tcd_image,0,sizeof(opj_tcd_image_v2_t)); + memset(l_tcd->tcd_image,0,sizeof(opj_tcd_image_t)); return l_tcd; } @@ -186,7 +190,7 @@ opj_tcd_v2_t* opj_tcd_create(opj_bool p_is_decoder) /* ----------------------------------------------------------------------- */ -void opj_tcd_rateallocate_fixed(opj_tcd_v2_t *tcd) { +void opj_tcd_rateallocate_fixed(opj_tcd_t *tcd) { OPJ_UINT32 layno; for (layno = 0; layno < tcd->tcp->numlayers; layno++) { @@ -195,7 +199,7 @@ void opj_tcd_rateallocate_fixed(opj_tcd_v2_t *tcd) { } -void opj_tcd_makelayer( opj_tcd_v2_t *tcd, +void opj_tcd_makelayer( opj_tcd_t *tcd, OPJ_UINT32 layno, OPJ_FLOAT64 thresh, OPJ_UINT32 final) @@ -203,24 +207,24 @@ void opj_tcd_makelayer( opj_tcd_v2_t *tcd, OPJ_UINT32 compno, resno, bandno, precno, cblkno; OPJ_UINT32 passno; - opj_tcd_tile_v2_t *tcd_tile = tcd->tcd_image->tiles; + opj_tcd_tile_t *tcd_tile = tcd->tcd_image->tiles; tcd_tile->distolayer[layno] = 0; /* fixed_quality */ for (compno = 0; compno < tcd_tile->numcomps; compno++) { - opj_tcd_tilecomp_v2_t *tilec = &tcd_tile->comps[compno]; + opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno]; for (resno = 0; resno < tilec->numresolutions; resno++) { - opj_tcd_resolution_v2_t *res = &tilec->resolutions[resno]; + opj_tcd_resolution_t *res = &tilec->resolutions[resno]; for (bandno = 0; bandno < res->numbands; bandno++) { - opj_tcd_band_v2_t *band = &res->bands[bandno]; + opj_tcd_band_t *band = &res->bands[bandno]; for (precno = 0; precno < res->pw * res->ph; precno++) { - opj_tcd_precinct_v2_t *prc = &band->precincts[precno]; + opj_tcd_precinct_t *prc = &band->precincts[precno]; for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) { - opj_tcd_cblk_enc_v2_t *cblk = &prc->cblks.enc[cblkno]; + opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno]; opj_tcd_layer_t *layer = &cblk->layers[layno]; OPJ_UINT32 n; @@ -231,9 +235,9 @@ void opj_tcd_makelayer( opj_tcd_v2_t *tcd, n = cblk->numpassesinlayers; for (passno = cblk->numpassesinlayers; passno < cblk->totalpasses; passno++) { - OPJ_INT32 dr; + OPJ_UINT32 dr; OPJ_FLOAT64 dd; - opj_tcd_pass_v2_t *pass = &cblk->passes[passno]; + opj_tcd_pass_t *pass = &cblk->passes[passno]; if (n == 0) { dr = pass->rate; @@ -280,43 +284,43 @@ void opj_tcd_makelayer( opj_tcd_v2_t *tcd, } } -void opj_tcd_makelayer_fixed(opj_tcd_v2_t *tcd, OPJ_UINT32 layno, OPJ_UINT32 final) { +void opj_tcd_makelayer_fixed(opj_tcd_t *tcd, OPJ_UINT32 layno, OPJ_UINT32 final) { OPJ_UINT32 compno, resno, bandno, precno, cblkno; OPJ_INT32 value; /*, matrice[tcd_tcp->numlayers][tcd_tile->comps[0].numresolutions][3]; */ OPJ_INT32 matrice[10][10][3]; OPJ_UINT32 i, j, k; - opj_cp_v2_t *cp = tcd->cp; - opj_tcd_tile_v2_t *tcd_tile = tcd->tcd_image->tiles; - opj_tcp_v2_t *tcd_tcp = tcd->tcp; + opj_cp_t *cp = tcd->cp; + opj_tcd_tile_t *tcd_tile = tcd->tcd_image->tiles; + opj_tcp_t *tcd_tcp = tcd->tcp; for (compno = 0; compno < tcd_tile->numcomps; compno++) { - opj_tcd_tilecomp_v2_t *tilec = &tcd_tile->comps[compno]; + opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno]; for (i = 0; i < tcd_tcp->numlayers; i++) { for (j = 0; j < tilec->numresolutions; j++) { for (k = 0; k < 3; k++) { matrice[i][j][k] = - (OPJ_INT32) (cp->m_specific_param.m_enc.m_matrice[i * tilec->numresolutions * 3 + j * 3 + k] + (OPJ_INT32) ((OPJ_FLOAT32)cp->m_specific_param.m_enc.m_matrice[i * tilec->numresolutions * 3 + j * 3 + k] * (OPJ_FLOAT32) (tcd->image->comps[compno].prec / 16.0)); } } } for (resno = 0; resno < tilec->numresolutions; resno++) { - opj_tcd_resolution_v2_t *res = &tilec->resolutions[resno]; + opj_tcd_resolution_t *res = &tilec->resolutions[resno]; for (bandno = 0; bandno < res->numbands; bandno++) { - opj_tcd_band_v2_t *band = &res->bands[bandno]; + opj_tcd_band_t *band = &res->bands[bandno]; for (precno = 0; precno < res->pw * res->ph; precno++) { - opj_tcd_precinct_v2_t *prc = &band->precincts[precno]; + opj_tcd_precinct_t *prc = &band->precincts[precno]; for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) { - opj_tcd_cblk_enc_v2_t *cblk = &prc->cblks.enc[cblkno]; + opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno]; opj_tcd_layer_t *layer = &cblk->layers[layno]; OPJ_UINT32 n; - OPJ_INT32 imsb = tcd->image->comps[compno].prec - cblk->numbps; /* number of bit-plan equal to zero */ + OPJ_INT32 imsb = (OPJ_INT32)(tcd->image->comps[compno].prec - cblk->numbps); /* number of bit-plan equal to zero */ /* Correction of the matrix of coefficient to include the IMSB information */ if (layno == 0) { @@ -373,7 +377,7 @@ void opj_tcd_makelayer_fixed(opj_tcd_v2_t *tcd, OPJ_UINT32 layno, OPJ_UINT32 fin } } -opj_bool opj_tcd_rateallocate( opj_tcd_v2_t *tcd, +OPJ_BOOL opj_tcd_rateallocate( opj_tcd_t *tcd, OPJ_BYTE *dest, OPJ_UINT32 * p_data_written, OPJ_UINT32 len, @@ -386,9 +390,9 @@ opj_bool opj_tcd_rateallocate( opj_tcd_v2_t *tcd, const OPJ_FLOAT64 K = 1; /* 1.1; fixed_quality */ OPJ_FLOAT64 maxSE = 0; - opj_cp_v2_t *cp = tcd->cp; - opj_tcd_tile_v2_t *tcd_tile = tcd->tcd_image->tiles; - opj_tcp_v2_t *tcd_tcp = tcd->tcp; + opj_cp_t *cp = tcd->cp; + opj_tcd_tile_t *tcd_tile = tcd->tcd_image->tiles; + opj_tcp_t *tcd_tcp = tcd->tcp; min = DBL_MAX; max = 0; @@ -396,31 +400,31 @@ opj_bool opj_tcd_rateallocate( opj_tcd_v2_t *tcd, tcd_tile->numpix = 0; /* fixed_quality */ for (compno = 0; compno < tcd_tile->numcomps; compno++) { - opj_tcd_tilecomp_v2_t *tilec = &tcd_tile->comps[compno]; + opj_tcd_tilecomp_t *tilec = &tcd_tile->comps[compno]; tilec->numpix = 0; for (resno = 0; resno < tilec->numresolutions; resno++) { - opj_tcd_resolution_v2_t *res = &tilec->resolutions[resno]; + opj_tcd_resolution_t *res = &tilec->resolutions[resno]; for (bandno = 0; bandno < res->numbands; bandno++) { - opj_tcd_band_v2_t *band = &res->bands[bandno]; + opj_tcd_band_t *band = &res->bands[bandno]; for (precno = 0; precno < res->pw * res->ph; precno++) { - opj_tcd_precinct_v2_t *prc = &band->precincts[precno]; + opj_tcd_precinct_t *prc = &band->precincts[precno]; for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) { - opj_tcd_cblk_enc_v2_t *cblk = &prc->cblks.enc[cblkno]; + opj_tcd_cblk_enc_t *cblk = &prc->cblks.enc[cblkno]; for (passno = 0; passno < cblk->totalpasses; passno++) { - opj_tcd_pass_v2_t *pass = &cblk->passes[passno]; + opj_tcd_pass_t *pass = &cblk->passes[passno]; OPJ_INT32 dr; OPJ_FLOAT64 dd, rdslope; if (passno == 0) { - dr = pass->rate; + dr = (OPJ_INT32)pass->rate; dd = pass->distortiondec; } else { - dr = pass->rate - cblk->passes[passno - 1].rate; + dr = (OPJ_INT32)(pass->rate - cblk->passes[passno - 1].rate); dd = pass->distortiondec - cblk->passes[passno - 1].distortiondec; } @@ -462,7 +466,7 @@ opj_bool opj_tcd_rateallocate( opj_tcd_v2_t *tcd, for (layno = 0; layno < tcd_tcp->numlayers; layno++) { OPJ_FLOAT64 lo = min; OPJ_FLOAT64 hi = max; - opj_bool success = OPJ_FALSE; + OPJ_BOOL success = OPJ_FALSE; OPJ_UINT32 maxlen = tcd_tcp->rates[layno] ? opj_uint_min(((OPJ_UINT32) ceil(tcd_tcp->rates[layno])), len) : len; OPJ_FLOAT64 goodthresh = 0; OPJ_FLOAT64 stable_thresh = 0; @@ -477,7 +481,7 @@ opj_bool opj_tcd_rateallocate( opj_tcd_v2_t *tcd, -q xx,yy,zz,0 (fixed_quality == 1 and distoratio == 0) ==> possible to have some lossy layers and the last layer for sure lossless */ if ( ((cp->m_specific_param.m_enc.m_disto_alloc==1) && (tcd_tcp->rates[layno]>0)) || ((cp->m_specific_param.m_enc.m_fixed_quality==1) && (tcd_tcp->distoratio[layno]>0))) { - opj_t2_v2_t*t2 = opj_t2_create(tcd->image, cp); + opj_t2_t*t2 = opj_t2_create(tcd->image, cp); OPJ_FLOAT64 thresh = 0; if (t2 == 00) { @@ -561,23 +565,23 @@ opj_bool opj_tcd_rateallocate( opj_tcd_v2_t *tcd, return OPJ_TRUE; } -opj_bool opj_tcd_init( opj_tcd_v2_t *p_tcd, +OPJ_BOOL opj_tcd_init( opj_tcd_t *p_tcd, opj_image_t * p_image, - opj_cp_v2_t * p_cp ) + opj_cp_t * p_cp ) { OPJ_UINT32 l_tile_comp_size; p_tcd->image = p_image; p_tcd->cp = p_cp; - p_tcd->tcd_image->tiles = (opj_tcd_tile_v2_t *) opj_malloc(sizeof(opj_tcd_tile_v2_t)); + p_tcd->tcd_image->tiles = (opj_tcd_tile_t *) opj_malloc(sizeof(opj_tcd_tile_t)); if (! p_tcd->tcd_image->tiles) { return OPJ_FALSE; } - memset(p_tcd->tcd_image->tiles,0, sizeof(opj_tcd_tile_v2_t)); + memset(p_tcd->tcd_image->tiles,0, sizeof(opj_tcd_tile_t)); - l_tile_comp_size = p_image->numcomps * sizeof(opj_tcd_tilecomp_v2_t); - p_tcd->tcd_image->tiles->comps = (opj_tcd_tilecomp_v2_t *) opj_malloc(l_tile_comp_size); + l_tile_comp_size = p_image->numcomps * (OPJ_UINT32)sizeof(opj_tcd_tilecomp_t); + p_tcd->tcd_image->tiles->comps = (opj_tcd_tilecomp_t *) opj_malloc(l_tile_comp_size); if (! p_tcd->tcd_image->tiles->comps ) { return OPJ_FALSE; } @@ -592,7 +596,7 @@ opj_bool opj_tcd_init( opj_tcd_v2_t *p_tcd, /** Destroy a previously created TCD handle */ -void opj_tcd_destroy(opj_tcd_v2_t *tcd) { +void opj_tcd_destroy(opj_tcd_t *tcd) { if (tcd) { opj_tcd_free_tile(tcd); @@ -605,23 +609,23 @@ void opj_tcd_destroy(opj_tcd_v2_t *tcd) { } /* ----------------------------------------------------------------------- */ -#define MACRO_TCD_ALLOCATE(FUNCTION,TYPE,FRACTION,ELEMENT,FUNCTION_ELEMENT) \ -opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ +#define OPJ_MACRO_TCD_ALLOCATE(FUNCTION,TYPE,FRACTION,ELEMENT,FUNCTION_ELEMENT) \ +OPJ_BOOL FUNCTION ( opj_tcd_t *p_tcd, \ OPJ_UINT32 p_tile_no \ ) \ { \ OPJ_UINT32 (*l_gain_ptr)(OPJ_UINT32) = 00; \ OPJ_UINT32 compno, resno, bandno, precno, cblkno; \ - opj_tcp_v2_t * l_tcp = 00; \ - opj_cp_v2_t * l_cp = 00; \ - opj_tcd_tile_v2_t * l_tile = 00; \ + opj_tcp_t * l_tcp = 00; \ + opj_cp_t * l_cp = 00; \ + opj_tcd_tile_t * l_tile = 00; \ opj_tccp_t *l_tccp = 00; \ - opj_tcd_tilecomp_v2_t *l_tilec = 00; \ + opj_tcd_tilecomp_t *l_tilec = 00; \ opj_image_comp_t * l_image_comp = 00; \ - opj_tcd_resolution_v2_t *l_res = 00; \ - opj_tcd_band_v2_t *l_band = 00; \ + opj_tcd_resolution_t *l_res = 00; \ + opj_tcd_band_t *l_band = 00; \ opj_stepsize_t * l_step_size = 00; \ - opj_tcd_precinct_v2_t *l_current_precinct = 00; \ + opj_tcd_precinct_t *l_current_precinct = 00; \ TYPE* l_code_block = 00; \ opj_image_t *l_image = 00; \ OPJ_UINT32 p,q; \ @@ -659,6 +663,11 @@ opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ l_tile->y0 = opj_int_max(l_cp->ty0 + q * l_cp->tdy, l_image->y0); \ l_tile->x1 = opj_int_min(l_cp->tx0 + (p + 1) * l_cp->tdx, l_image->x1); \ l_tile->y1 = opj_int_min(l_cp->ty0 + (q + 1) * l_cp->tdy, l_image->y1); \ + /* testcase 1888.pdf.asan.35.988 */ \ + if (l_tccp->numresolutions == 0) { \ + fprintf(stderr, "tiles require at least one resolution\n"); \ + return OPJ_FALSE; \ + } \ /*fprintf(stderr, "Tile border = %d,%d,%d,%d\n", l_tile->x0, l_tile->y0,l_tile->x1,l_tile->y1);*/ \ \ /*tile->numcomps = image->numcomps; */ \ @@ -673,7 +682,7 @@ opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ /*fprintf(stderr, "\tTile compo border = %d,%d,%d,%d\n", l_tilec->x0, l_tilec->y0,l_tilec->x1,l_tilec->y1);*/ \ \ l_data_size = (l_tilec->x1 - l_tilec->x0) \ - * (l_tilec->y1 - l_tilec->y0) * sizeof(OPJ_UINT32 );\ + * (l_tilec->y1 - l_tilec->y0) * (OPJ_UINT32)sizeof(OPJ_UINT32 );\ l_tilec->numresolutions = l_tccp->numresolutions; \ if (l_tccp->numresolutions < l_cp->m_specific_param.m_dec.m_reduce) { \ l_tilec->minimum_num_resolutions = 1; \ @@ -694,7 +703,7 @@ opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ } \ else if (l_data_size > l_tilec->data_size) { \ OPJ_INT32 * new_data = (OPJ_INT32 *) opj_realloc(l_tilec->data, l_data_size); \ - /* opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to handle tile data\n"); */ \ + /* opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to handle tile data\n"); */ \ fprintf(stderr, "Not enough memory to handle tile data\n"); \ if (! new_data) { \ opj_free(l_tilec->data); \ @@ -707,21 +716,21 @@ opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ l_tilec->data_size = l_data_size; \ } \ \ - l_data_size = l_tilec->numresolutions * sizeof(opj_tcd_resolution_v2_t); \ + l_data_size = l_tilec->numresolutions * (OPJ_UINT32)sizeof(opj_tcd_resolution_t); \ \ if (l_tilec->resolutions == 00) { \ - l_tilec->resolutions = (opj_tcd_resolution_v2_t *) opj_malloc(l_data_size); \ + l_tilec->resolutions = (opj_tcd_resolution_t *) opj_malloc(l_data_size); \ if (! l_tilec->resolutions ) { \ return OPJ_FALSE; \ } \ - /*fprintf(stderr, "\tAllocate resolutions of tilec (opj_tcd_resolution_v2_t): %d\n",l_data_size);*/ \ + /*fprintf(stderr, "\tAllocate resolutions of tilec (opj_tcd_resolution_t): %d\n",l_data_size);*/ \ l_tilec->resolutions_size = l_data_size; \ memset(l_tilec->resolutions,0,l_data_size); \ } \ else if (l_data_size > l_tilec->resolutions_size) { \ - opj_tcd_resolution_v2_t* new_resolutions = (opj_tcd_resolution_v2_t *) opj_realloc(l_tilec->resolutions, l_data_size); \ + opj_tcd_resolution_t* new_resolutions = (opj_tcd_resolution_t *) opj_realloc(l_tilec->resolutions, l_data_size); \ if (! new_resolutions) { \ - /* opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to tile resolutions\n"); */ \ + /* opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to tile resolutions\n"); */ \ fprintf(stderr, "Not enough memory to tile resolutions\n"); \ opj_free(l_tilec->resolutions); \ l_tilec->resolutions = NULL; \ @@ -747,7 +756,7 @@ opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ \ for(resno = 0; resno < l_tilec->numresolutions; ++resno) { \ /*fprintf(stderr, "\t\tresno = %d/%d\n", resno, l_tilec->numresolutions);*/ \ - OPJ_INT32 tlcbgxstart, tlcbgystart, brcbgxend, brcbgyend; \ + OPJ_INT32 tlcbgxstart, tlcbgystart /*, brcbgxend, brcbgyend*/; \ OPJ_UINT32 cbgwidthexpn, cbgheightexpn; \ OPJ_UINT32 cblkwidthexpn, cblkheightexpn; \ \ @@ -773,12 +782,12 @@ opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ /*fprintf(stderr, "\t\t\tres_pw=%d, res_ph=%d\n", l_res->pw, l_res->ph );*/ \ \ l_nb_precincts = l_res->pw * l_res->ph; \ - l_nb_precinct_size = l_nb_precincts * sizeof(opj_tcd_precinct_v2_t); \ + l_nb_precinct_size = l_nb_precincts * (OPJ_UINT32)sizeof(opj_tcd_precinct_t); \ if (resno == 0) { \ tlcbgxstart = l_tl_prc_x_start; \ tlcbgystart = l_tl_prc_y_start; \ - brcbgxend = l_br_prc_x_end; \ - brcbgyend = l_br_prc_y_end; \ + /*brcbgxend = l_br_prc_x_end;*/ \ + /* brcbgyend = l_br_prc_y_end;*/ \ cbgwidthexpn = l_pdx; \ cbgheightexpn = l_pdy; \ l_res->numbands = 1; \ @@ -786,8 +795,8 @@ opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ else { \ tlcbgxstart = opj_int_ceildivpow2(l_tl_prc_x_start, 1); \ tlcbgystart = opj_int_ceildivpow2(l_tl_prc_y_start, 1); \ - brcbgxend = opj_int_ceildivpow2(l_br_prc_x_end, 1); \ - brcbgyend = opj_int_ceildivpow2(l_br_prc_y_end, 1); \ + /*brcbgxend = opj_int_ceildivpow2(l_br_prc_x_end, 1);*/ \ + /*brcbgyend = opj_int_ceildivpow2(l_br_prc_y_end, 1);*/ \ cbgwidthexpn = l_pdx - 1; \ cbgheightexpn = l_pdy - 1; \ l_res->numbands = 3; \ @@ -828,19 +837,19 @@ opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ l_band->numbps = l_step_size->expn + l_tccp->numgbits - 1; /* WHY -1 ? */ \ \ if (! l_band->precincts) { \ - l_band->precincts = (opj_tcd_precinct_v2_t *) opj_malloc( /*3 * */ l_nb_precinct_size); \ + l_band->precincts = (opj_tcd_precinct_t *) opj_malloc( /*3 * */ l_nb_precinct_size); \ if (! l_band->precincts) { \ return OPJ_FALSE; \ } \ - /*fprintf(stderr, "\t\t\t\tAllocate precincts of a band (opj_tcd_precinct_v2_t): %d\n",l_nb_precinct_size); */ \ + /*fprintf(stderr, "\t\t\t\tAllocate precincts of a band (opj_tcd_precinct_t): %d\n",l_nb_precinct_size); */ \ memset(l_band->precincts,0,l_nb_precinct_size); \ l_band->precincts_data_size = l_nb_precinct_size; \ } \ else if (l_band->precincts_data_size < l_nb_precinct_size) { \ \ - opj_tcd_precinct_v2_t * new_precincts = (opj_tcd_precinct_v2_t *) opj_realloc(l_band->precincts,/*3 * */ l_nb_precinct_size); \ + opj_tcd_precinct_t * new_precincts = (opj_tcd_precinct_t *) opj_realloc(l_band->precincts,/*3 * */ l_nb_precinct_size); \ if (! new_precincts) { \ - /* opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory to handle band precints\n"); */ \ + /* opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to handle band precints\n"); */ \ fprintf(stderr, "Not enough memory to handle band precints\n"); \ opj_free(l_band->precincts); \ l_band->precincts = NULL; \ @@ -848,7 +857,7 @@ opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ return OPJ_FALSE; \ } \ l_band->precincts = new_precincts; \ - /*fprintf(stderr, "\t\t\t\tReallocate precincts of a band (opj_tcd_precinct_v2_t): from %d to %d\n",l_band->precincts_data_size, l_nb_precinct_size);*/ \ + /*fprintf(stderr, "\t\t\t\tReallocate precincts of a band (opj_tcd_precinct_t): from %d to %d\n",l_band->precincts_data_size, l_nb_precinct_size);*/ \ memset(((OPJ_BYTE *) l_band->precincts) + l_band->precincts_data_size,0,l_nb_precinct_size - l_band->precincts_data_size); \ l_band->precincts_data_size = l_nb_precinct_size; \ } \ @@ -885,14 +894,14 @@ opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ \ l_nb_code_blocks = l_current_precinct->cw * l_current_precinct->ch; \ /*fprintf(stderr, "\t\t\t\t precinct_cw = %d x recinct_ch = %d\n",l_current_precinct->cw, l_current_precinct->ch); */ \ - l_nb_code_blocks_size = l_nb_code_blocks * sizeof(TYPE); \ + l_nb_code_blocks_size = l_nb_code_blocks * (OPJ_UINT32)sizeof(TYPE); \ \ if (! l_current_precinct->cblks.ELEMENT) { \ l_current_precinct->cblks.ELEMENT = (TYPE*) opj_malloc(l_nb_code_blocks_size); \ if (! l_current_precinct->cblks.ELEMENT ) { \ return OPJ_FALSE; \ } \ - /*fprintf(stderr, "\t\t\t\tAllocate cblks of a precinct (opj_tcd_cblk_dec_v2_t): %d\n",l_nb_code_blocks_size);*/ \ + /*fprintf(stderr, "\t\t\t\tAllocate cblks of a precinct (opj_tcd_cblk_dec_t): %d\n",l_nb_code_blocks_size);*/ \ \ memset(l_current_precinct->cblks.ELEMENT,0,l_nb_code_blocks_size); \ \ @@ -904,12 +913,12 @@ opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ opj_free(l_current_precinct->cblks.ELEMENT); \ l_current_precinct->cblks.ELEMENT = NULL; \ l_current_precinct->block_size = 0; \ - /* opj_event_msg_v2(p_manager, EVT_ERROR, "Not enough memory for current precinct codeblock element\n"); */ \ + /* opj_event_msg(p_manager, EVT_ERROR, "Not enough memory for current precinct codeblock element\n"); */ \ fprintf(stderr, "Not enough memory for current precinct codeblock element\n"); \ return OPJ_FALSE; \ } \ l_current_precinct->cblks.ELEMENT = new_ELEMENT; \ - /*fprintf(stderr, "\t\t\t\tReallocate cblks of a precinct (opj_tcd_cblk_dec_v2_t): from %d to %d\n",l_current_precinct->block_size, l_nb_code_blocks_size); */\ + /*fprintf(stderr, "\t\t\t\tReallocate cblks of a precinct (opj_tcd_cblk_dec_t): from %d to %d\n",l_current_precinct->block_size, l_nb_code_blocks_size); */\ \ memset(((OPJ_BYTE *) l_current_precinct->cblks.ELEMENT) + l_current_precinct->block_size \ ,0 \ @@ -985,19 +994,19 @@ opj_bool FUNCTION ( opj_tcd_v2_t *p_tcd, \ } \ -MACRO_TCD_ALLOCATE(opj_tcd_init_encode_tile, opj_tcd_cblk_enc_v2_t, 1.f, enc, opj_tcd_code_block_enc_allocate) -MACRO_TCD_ALLOCATE(opj_tcd_init_decode_tile, opj_tcd_cblk_dec_v2_t, 0.5f, dec, opj_tcd_code_block_dec_allocate) +OPJ_MACRO_TCD_ALLOCATE(opj_tcd_init_encode_tile, opj_tcd_cblk_enc_t, 1.f, enc, opj_tcd_code_block_enc_allocate) +OPJ_MACRO_TCD_ALLOCATE(opj_tcd_init_decode_tile, opj_tcd_cblk_dec_t, 0.5f, dec, opj_tcd_code_block_dec_allocate) -#undef MACRO_TCD_ALLOCATE +#undef OPJ_MACRO_TCD_ALLOCATE /** * Allocates memory for an encoding code block. */ -opj_bool opj_tcd_code_block_enc_allocate (opj_tcd_cblk_enc_v2_t * p_code_block) +OPJ_BOOL opj_tcd_code_block_enc_allocate (opj_tcd_cblk_enc_t * p_code_block) { if (! p_code_block->data) { - p_code_block->data = (OPJ_BYTE*) opj_malloc(8192+1); + p_code_block->data = (OPJ_BYTE*) opj_malloc(OPJ_J2K_DEFAULT_CBLK_DATA_SIZE); /*why +1 ?*/ if(! p_code_block->data) { return OPJ_FALSE; } @@ -1011,14 +1020,14 @@ opj_bool opj_tcd_code_block_enc_allocate (opj_tcd_cblk_enc_v2_t * p_code_block) return OPJ_FALSE; } - p_code_block->passes = (opj_tcd_pass_v2_t*) opj_malloc(100 * sizeof(opj_tcd_pass_v2_t)); + p_code_block->passes = (opj_tcd_pass_t*) opj_malloc(100 * sizeof(opj_tcd_pass_t)); if (! p_code_block->passes) { return OPJ_FALSE; } } memset(p_code_block->layers,0,100 * sizeof(opj_tcd_layer_t)); - memset(p_code_block->passes,0,100 * sizeof(opj_tcd_pass_v2_t)); + memset(p_code_block->passes,0,100 * sizeof(opj_tcd_pass_t)); return OPJ_TRUE; } @@ -1026,27 +1035,28 @@ opj_bool opj_tcd_code_block_enc_allocate (opj_tcd_cblk_enc_v2_t * p_code_block) /** * Allocates memory for a decoding code block. */ -opj_bool opj_tcd_code_block_dec_allocate (opj_tcd_cblk_dec_v2_t * p_code_block) +OPJ_BOOL opj_tcd_code_block_dec_allocate (opj_tcd_cblk_dec_t * p_code_block) { OPJ_UINT32 l_seg_size; if (! p_code_block->data) { - p_code_block->data = (OPJ_BYTE*) opj_malloc(8192); + p_code_block->data = (OPJ_BYTE*) opj_malloc(OPJ_J2K_DEFAULT_CBLK_DATA_SIZE); if (! p_code_block->data) { return OPJ_FALSE; } + p_code_block->data_max_size = OPJ_J2K_DEFAULT_CBLK_DATA_SIZE; /*fprintf(stderr, "Allocate 8192 elements of code_block->data\n");*/ - l_seg_size = J2K_DEFAULT_NB_SEGS * sizeof(opj_tcd_seg_t); + l_seg_size = OPJ_J2K_DEFAULT_NB_SEGS * sizeof(opj_tcd_seg_t); p_code_block->segs = (opj_tcd_seg_t *) opj_malloc(l_seg_size); if (! p_code_block->segs) { return OPJ_FALSE; } memset(p_code_block->segs,0,l_seg_size); - /*fprintf(stderr, "Allocate %d elements of code_block->data\n", J2K_DEFAULT_NB_SEGS * sizeof(opj_tcd_seg_t));*/ + /*fprintf(stderr, "Allocate %d elements of code_block->data\n", OPJ_J2K_DEFAULT_NB_SEGS * sizeof(opj_tcd_seg_t));*/ - p_code_block->m_current_max_segs = J2K_DEFAULT_NB_SEGS; + p_code_block->m_current_max_segs = OPJ_J2K_DEFAULT_NB_SEGS; /*fprintf(stderr, "m_current_max_segs of code_block->data = %d\n", p_code_block->m_current_max_segs);*/ } /* TODO */ @@ -1055,13 +1065,13 @@ opj_bool opj_tcd_code_block_dec_allocate (opj_tcd_cblk_dec_v2_t * p_code_block) return OPJ_TRUE; } -OPJ_UINT32 opj_tcd_get_decoded_tile_size ( opj_tcd_v2_t *p_tcd ) +OPJ_UINT32 opj_tcd_get_decoded_tile_size ( opj_tcd_t *p_tcd ) { OPJ_UINT32 i; OPJ_UINT32 l_data_size = 0; opj_image_comp_t * l_img_comp = 00; - opj_tcd_tilecomp_v2_t * l_tile_comp = 00; - opj_tcd_resolution_v2_t * l_res = 00; + opj_tcd_tilecomp_t * l_tile_comp = 00; + opj_tcd_resolution_t * l_res = 00; OPJ_UINT32 l_size_comp, l_remaining; l_tile_comp = p_tcd->tcd_image->tiles->comps; @@ -1080,7 +1090,7 @@ OPJ_UINT32 opj_tcd_get_decoded_tile_size ( opj_tcd_v2_t *p_tcd ) } l_res = l_tile_comp->resolutions + l_tile_comp->minimum_num_resolutions - 1; - l_data_size += l_size_comp * (l_res->x1 - l_res->x0) * (l_res->y1 - l_res->y0); + l_data_size += l_size_comp * (OPJ_UINT32)((l_res->x1 - l_res->x0) * (l_res->y1 - l_res->y0)); ++l_img_comp; ++l_tile_comp; } @@ -1088,7 +1098,7 @@ OPJ_UINT32 opj_tcd_get_decoded_tile_size ( opj_tcd_v2_t *p_tcd ) return l_data_size; } -opj_bool opj_tcd_encode_tile( opj_tcd_v2_t *p_tcd, +OPJ_BOOL opj_tcd_encode_tile( opj_tcd_t *p_tcd, OPJ_UINT32 p_tile_no, OPJ_BYTE *p_dest, OPJ_UINT32 * p_data_written, @@ -1105,20 +1115,20 @@ opj_bool opj_tcd_encode_tile( opj_tcd_v2_t *p_tcd, if(p_cstr_info) { OPJ_UINT32 l_num_packs = 0; OPJ_UINT32 i; - opj_tcd_tilecomp_v2_t *l_tilec_idx = &p_tcd->tcd_image->tiles->comps[0]; /* based on component 0 */ + opj_tcd_tilecomp_t *l_tilec_idx = &p_tcd->tcd_image->tiles->comps[0]; /* based on component 0 */ opj_tccp_t *l_tccp = p_tcd->tcp->tccps; /* based on component 0 */ for (i = 0; i < l_tilec_idx->numresolutions; i++) { - opj_tcd_resolution_v2_t *l_res_idx = &l_tilec_idx->resolutions[i]; + opj_tcd_resolution_t *l_res_idx = &l_tilec_idx->resolutions[i]; - p_cstr_info->tile[p_tile_no].pw[i] = l_res_idx->pw; - p_cstr_info->tile[p_tile_no].ph[i] = l_res_idx->ph; + p_cstr_info->tile[p_tile_no].pw[i] = (int)l_res_idx->pw; + p_cstr_info->tile[p_tile_no].ph[i] = (int)l_res_idx->ph; l_num_packs += l_res_idx->pw * l_res_idx->ph; - p_cstr_info->tile[p_tile_no].pdx[i] = l_tccp->prcw[i]; - p_cstr_info->tile[p_tile_no].pdy[i] = l_tccp->prch[i]; + p_cstr_info->tile[p_tile_no].pdx[i] = (int)l_tccp->prcw[i]; + p_cstr_info->tile[p_tile_no].pdy[i] = (int)l_tccp->prch[i]; } - p_cstr_info->tile[p_tile_no].packet = (opj_packet_info_t*) opj_calloc(p_cstr_info->numcomps * p_cstr_info->numlayers * l_num_packs, sizeof(opj_packet_info_t)); + p_cstr_info->tile[p_tile_no].packet = (opj_packet_info_t*) opj_calloc((size_t)p_cstr_info->numcomps * (size_t)p_cstr_info->numlayers * l_num_packs, sizeof(opj_packet_info_t)); } /* << INDEX */ @@ -1172,7 +1182,7 @@ opj_bool opj_tcd_encode_tile( opj_tcd_v2_t *p_tcd, return OPJ_TRUE; } -opj_bool opj_tcd_decode_tile( opj_tcd_v2_t *p_tcd, +OPJ_BOOL opj_tcd_decode_tile( opj_tcd_t *p_tcd, OPJ_BYTE *p_src, OPJ_UINT32 p_max_length, OPJ_UINT32 p_tile_no, @@ -1188,11 +1198,11 @@ opj_bool opj_tcd_decode_tile( opj_tcd_v2_t *p_tcd, if(p_cstr_info) { OPJ_UINT32 resno, compno, numprec = 0; for (compno = 0; compno < (OPJ_UINT32) p_cstr_info->numcomps; compno++) { - opj_tcp_v2_t *tcp = &p_tcd->cp->tcps[0]; + opj_tcp_t *tcp = &p_tcd->cp->tcps[0]; opj_tccp_t *tccp = &tcp->tccps[compno]; - opj_tcd_tilecomp_v2_t *tilec_idx = &p_tcd->tcd_image->tiles->comps[compno]; + opj_tcd_tilecomp_t *tilec_idx = &p_tcd->tcd_image->tiles->comps[compno]; for (resno = 0; resno < tilec_idx->numresolutions; resno++) { - opj_tcd_resolution_v2_t *res_idx = &tilec_idx->resolutions[resno]; + opj_tcd_resolution_t *res_idx = &tilec_idx->resolutions[resno]; p_cstr_info->tile[p_tile_no].pw[resno] = res_idx->pw; p_cstr_info->tile[p_tile_no].ph[resno] = res_idx->ph; numprec += res_idx->pw * res_idx->ph; @@ -1209,8 +1219,7 @@ opj_bool opj_tcd_decode_tile( opj_tcd_v2_t *p_tcd, /*--------------TIER2------------------*/ /* FIXME _ProfStart(PGROUP_T2); */ l_data_read = 0; - if - (! opj_tcd_t2_decode(p_tcd, p_src, &l_data_read, p_max_length, p_cstr_index)) + if (! opj_tcd_t2_decode(p_tcd, p_src, &l_data_read, p_max_length, p_cstr_index)) { return OPJ_FALSE; } @@ -1258,15 +1267,15 @@ opj_bool opj_tcd_decode_tile( opj_tcd_v2_t *p_tcd, return OPJ_TRUE; } -opj_bool opj_tcd_update_tile_data ( opj_tcd_v2_t *p_tcd, +OPJ_BOOL opj_tcd_update_tile_data ( opj_tcd_t *p_tcd, OPJ_BYTE * p_dest, OPJ_UINT32 p_dest_length ) { OPJ_UINT32 i,j,k,l_data_size = 0; opj_image_comp_t * l_img_comp = 00; - opj_tcd_tilecomp_v2_t * l_tilec = 00; - opj_tcd_resolution_v2_t * l_res; + opj_tcd_tilecomp_t * l_tilec = 00; + opj_tcd_resolution_t * l_res; OPJ_UINT32 l_size_comp, l_remaining; OPJ_UINT32 l_stride, l_width,l_height; @@ -1282,9 +1291,9 @@ opj_bool opj_tcd_update_tile_data ( opj_tcd_v2_t *p_tcd, l_size_comp = l_img_comp->prec >> 3; /*(/ 8)*/ l_remaining = l_img_comp->prec & 7; /* (%8) */ l_res = l_tilec->resolutions + l_img_comp->resno_decoded; - l_width = (l_res->x1 - l_res->x0); - l_height = (l_res->y1 - l_res->y0); - l_stride = (l_tilec->x1 - l_tilec->x0) - l_width; + l_width = (OPJ_UINT32)(l_res->x1 - l_res->x0); + l_height = (OPJ_UINT32)(l_res->y1 - l_res->y0); + l_stride = (OPJ_UINT32)(l_tilec->x1 - l_tilec->x0) - l_width; if (l_remaining) { ++l_size_comp; @@ -1312,7 +1321,7 @@ opj_bool opj_tcd_update_tile_data ( opj_tcd_v2_t *p_tcd, else { for (j=0;jresolutions; if (l_res) { - l_nb_resolutions = l_tile_comp->resolutions_size / sizeof(opj_tcd_resolution_v2_t); + l_nb_resolutions = l_tile_comp->resolutions_size / sizeof(opj_tcd_resolution_t); for (resno = 0; resno < l_nb_resolutions; ++resno) { l_band = l_res->bands; for (bandno = 0; bandno < 3; ++bandno) { l_precinct = l_band->precincts; if (l_precinct) { - l_nb_precincts = l_band->precincts_data_size / sizeof(opj_tcd_precinct_v2_t); + l_nb_precincts = l_band->precincts_data_size / sizeof(opj_tcd_precinct_t); for (precno = 0; precno < l_nb_precincts; ++precno) { opj_tgt_destroy(l_precinct->incltree); l_precinct->incltree = 00; @@ -1453,14 +1462,14 @@ void opj_tcd_free_tile(opj_tcd_v2_t *p_tcd) } -opj_bool opj_tcd_t2_decode (opj_tcd_v2_t *p_tcd, +OPJ_BOOL opj_tcd_t2_decode (opj_tcd_t *p_tcd, OPJ_BYTE * p_src_data, OPJ_UINT32 * p_data_read, OPJ_UINT32 p_max_src_size, opj_codestream_index_t *p_cstr_index ) { - opj_t2_v2_t * l_t2; + opj_t2_t * l_t2; l_t2 = opj_t2_create(p_tcd->image, p_tcd->cp); if (l_t2 == 00) { @@ -1485,12 +1494,12 @@ opj_bool opj_tcd_t2_decode (opj_tcd_v2_t *p_tcd, return OPJ_TRUE; } -opj_bool opj_tcd_t1_decode ( opj_tcd_v2_t *p_tcd ) +OPJ_BOOL opj_tcd_t1_decode ( opj_tcd_t *p_tcd ) { OPJ_UINT32 compno; opj_t1_t * l_t1; - opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles; - opj_tcd_tilecomp_v2_t* l_tile_comp = l_tile->comps; + opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles; + opj_tcd_tilecomp_t* l_tile_comp = l_tile->comps; opj_tccp_t * l_tccp = p_tcd->tcp->tccps; @@ -1515,11 +1524,11 @@ opj_bool opj_tcd_t1_decode ( opj_tcd_v2_t *p_tcd ) } -opj_bool opj_tcd_dwt_decode ( opj_tcd_v2_t *p_tcd ) +OPJ_BOOL opj_tcd_dwt_decode ( opj_tcd_t *p_tcd ) { OPJ_UINT32 compno; - opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles; - opj_tcd_tilecomp_v2_t * l_tile_comp = l_tile->comps; + opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles; + opj_tcd_tilecomp_t * l_tile_comp = l_tile->comps; opj_tccp_t * l_tccp = p_tcd->tcp->tccps; opj_image_comp_t * l_img_comp = p_tcd->image->comps; @@ -1543,7 +1552,7 @@ opj_bool opj_tcd_dwt_decode ( opj_tcd_v2_t *p_tcd ) } } else { - if (! dwt_decode_real_v2(l_tile_comp, l_img_comp->resno_decoded+1)) { + if (! opj_dwt_decode_real(l_tile_comp, l_img_comp->resno_decoded+1)) { return OPJ_FALSE; } } @@ -1555,21 +1564,28 @@ opj_bool opj_tcd_dwt_decode ( opj_tcd_v2_t *p_tcd ) return OPJ_TRUE; } -opj_bool opj_tcd_mct_decode ( opj_tcd_v2_t *p_tcd ) +OPJ_BOOL opj_tcd_mct_decode ( opj_tcd_t *p_tcd ) { - opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles; - opj_tcp_v2_t * l_tcp = p_tcd->tcp; - opj_tcd_tilecomp_v2_t * l_tile_comp = l_tile->comps; + opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles; + opj_tcp_t * l_tcp = p_tcd->tcp; + opj_tcd_tilecomp_t * l_tile_comp = l_tile->comps; OPJ_UINT32 l_samples,i; if (! l_tcp->mct) { return OPJ_TRUE; } - l_samples = (l_tile_comp->x1 - l_tile_comp->x0) * (l_tile_comp->y1 - l_tile_comp->y0); + l_samples = (OPJ_UINT32)((l_tile_comp->x1 - l_tile_comp->x0) * (l_tile_comp->y1 - l_tile_comp->y0)); if (l_tile->numcomps >= 3 ){ - if (l_tcp->mct == 2) { + /* testcase 1336.pdf.asan.47.376 */ + if ((l_tile->comps[0].x1 - l_tile->comps[0].x0) * (l_tile->comps[0].y1 - l_tile->comps[0].y0) < (OPJ_INT32)l_samples || + (l_tile->comps[1].x1 - l_tile->comps[1].x0) * (l_tile->comps[1].y1 - l_tile->comps[1].y0) < (OPJ_INT32)l_samples || + (l_tile->comps[2].x1 - l_tile->comps[2].x0) * (l_tile->comps[2].y1 - l_tile->comps[2].y0) < (OPJ_INT32)l_samples) { + fprintf(stderr, "Tiles don't all have the same dimension. Skip the MCT step.\n"); + return OPJ_FALSE; + } + else if (l_tcp->mct == 2) { OPJ_BYTE ** l_data; if (! l_tcp->m_mct_decoding_matrix) { @@ -1610,15 +1626,15 @@ opj_bool opj_tcd_mct_decode ( opj_tcd_v2_t *p_tcd ) l_samples); } else { - opj_mct_decode_real( (float*)l_tile->comps[0].data, - (float*)l_tile->comps[1].data, - (float*)l_tile->comps[2].data, - l_samples); + opj_mct_decode_real((OPJ_FLOAT32*)l_tile->comps[0].data, + (OPJ_FLOAT32*)l_tile->comps[1].data, + (OPJ_FLOAT32*)l_tile->comps[2].data, + l_samples); } } } else { - /* FIXME need to use opj_event_msg_v2 function */ + /* FIXME need to use opj_event_msg function */ fprintf(stderr,"Number of components (%d) is inconsistent with a MCT. Skip the MCT step.\n",l_tile->numcomps); } @@ -1626,15 +1642,14 @@ opj_bool opj_tcd_mct_decode ( opj_tcd_v2_t *p_tcd ) } -opj_bool opj_tcd_dc_level_shift_decode ( opj_tcd_v2_t *p_tcd ) +OPJ_BOOL opj_tcd_dc_level_shift_decode ( opj_tcd_t *p_tcd ) { OPJ_UINT32 compno; - opj_tcd_tilecomp_v2_t * l_tile_comp = 00; + opj_tcd_tilecomp_t * l_tile_comp = 00; opj_tccp_t * l_tccp = 00; opj_image_comp_t * l_img_comp = 00; - opj_tcd_resolution_v2_t* l_res = 00; - opj_tcp_v2_t * l_tcp = 00; - opj_tcd_tile_v2_t * l_tile; + opj_tcd_resolution_t* l_res = 00; + opj_tcd_tile_t * l_tile; OPJ_UINT32 l_width,l_height,i,j; OPJ_INT32 * l_current_ptr; OPJ_INT32 l_min, l_max; @@ -1642,15 +1657,16 @@ opj_bool opj_tcd_dc_level_shift_decode ( opj_tcd_v2_t *p_tcd ) l_tile = p_tcd->tcd_image->tiles; l_tile_comp = l_tile->comps; - l_tcp = p_tcd->tcp; l_tccp = p_tcd->tcp->tccps; l_img_comp = p_tcd->image->comps; for (compno = 0; compno < l_tile->numcomps; compno++) { l_res = l_tile_comp->resolutions + l_img_comp->resno_decoded; - l_width = (l_res->x1 - l_res->x0); - l_height = (l_res->y1 - l_res->y0); - l_stride = (l_tile_comp->x1 - l_tile_comp->x0) - l_width; + l_width = (OPJ_UINT32)(l_res->x1 - l_res->x0); + l_height = (OPJ_UINT32)(l_res->y1 - l_res->y0); + l_stride = (OPJ_UINT32)(l_tile_comp->x1 - l_tile_comp->x0) - l_width; + + assert(l_height == 0 || l_width + l_stride <= l_tile_comp->data_size / l_height); /*MUPDF*/ if (l_img_comp->sgnd) { l_min = -(1 << (l_img_comp->prec - 1)); @@ -1676,7 +1692,7 @@ opj_bool opj_tcd_dc_level_shift_decode ( opj_tcd_v2_t *p_tcd ) for (j=0;jm_dc_level_shift, l_min, l_max); ; + *l_current_ptr = opj_int_clamp((OPJ_INT32)lrintf(l_value) + l_tccp->m_dc_level_shift, l_min, l_max); ; ++l_current_ptr; } l_current_ptr += l_stride; @@ -1696,11 +1712,11 @@ opj_bool opj_tcd_dc_level_shift_decode ( opj_tcd_v2_t *p_tcd ) /** * Deallocates the encoding data of the given precinct. */ -void opj_tcd_code_block_dec_deallocate (opj_tcd_precinct_v2_t * p_precinct) +void opj_tcd_code_block_dec_deallocate (opj_tcd_precinct_t * p_precinct) { OPJ_UINT32 cblkno , l_nb_code_blocks; - opj_tcd_cblk_dec_v2_t * l_code_block = p_precinct->cblks.dec; + opj_tcd_cblk_dec_t * l_code_block = p_precinct->cblks.dec; if (l_code_block) { /*fprintf(stderr,"deallocate codeblock:{\n");*/ /*fprintf(stderr,"\t x0=%d, y0=%d, x1=%d, y1=%d\n",l_code_block->x0, l_code_block->y0, l_code_block->x1, l_code_block->y1);*/ @@ -1708,7 +1724,7 @@ void opj_tcd_code_block_dec_deallocate (opj_tcd_precinct_v2_t * p_precinct) l_code_block->numbps, l_code_block->numlenbits, l_code_block->len, l_code_block->numnewpasses, l_code_block->real_num_segs, l_code_block->m_current_max_segs );*/ - l_nb_code_blocks = p_precinct->block_size / sizeof(opj_tcd_cblk_dec_v2_t); + l_nb_code_blocks = p_precinct->block_size / sizeof(opj_tcd_cblk_dec_t); /*fprintf(stderr,"nb_code_blocks =%d\t}\n", l_nb_code_blocks);*/ for (cblkno = 0; cblkno < l_nb_code_blocks; ++cblkno) { @@ -1734,17 +1750,17 @@ void opj_tcd_code_block_dec_deallocate (opj_tcd_precinct_v2_t * p_precinct) /** * Deallocates the encoding data of the given precinct. */ -void opj_tcd_code_block_enc_deallocate (opj_tcd_precinct_v2_t * p_precinct) +void opj_tcd_code_block_enc_deallocate (opj_tcd_precinct_t * p_precinct) { OPJ_UINT32 cblkno , l_nb_code_blocks; - opj_tcd_cblk_enc_v2_t * l_code_block = p_precinct->cblks.enc; + opj_tcd_cblk_enc_t * l_code_block = p_precinct->cblks.enc; if (l_code_block) { l_nb_code_blocks = p_precinct->block_size / sizeof(opj_tcd_cblk_enc_t); for (cblkno = 0; cblkno < l_nb_code_blocks; ++cblkno) { if (l_code_block->data) { - opj_free(l_code_block->data-1); + opj_free(l_code_block->data - 1); l_code_block->data = 00; } @@ -1766,11 +1782,11 @@ void opj_tcd_code_block_enc_deallocate (opj_tcd_precinct_v2_t * p_precinct) } } -OPJ_UINT32 opj_tcd_get_encoded_tile_size ( opj_tcd_v2_t *p_tcd ) +OPJ_UINT32 opj_tcd_get_encoded_tile_size ( opj_tcd_t *p_tcd ) { OPJ_UINT32 i,l_data_size = 0; opj_image_comp_t * l_img_comp = 00; - opj_tcd_tilecomp_v2_t * l_tilec = 00; + opj_tcd_tilecomp_t * l_tilec = 00; OPJ_UINT32 l_size_comp, l_remaining; l_tilec = p_tcd->tcd_image->tiles->comps; @@ -1787,7 +1803,7 @@ OPJ_UINT32 opj_tcd_get_encoded_tile_size ( opj_tcd_v2_t *p_tcd ) l_size_comp = 4; } - l_data_size += l_size_comp * (l_tilec->x1 - l_tilec->x0) * (l_tilec->y1 - l_tilec->y0); + l_data_size += l_size_comp * (OPJ_UINT32)((l_tilec->x1 - l_tilec->x0) * (l_tilec->y1 - l_tilec->y0)); ++l_img_comp; ++l_tilec; } @@ -1795,26 +1811,24 @@ OPJ_UINT32 opj_tcd_get_encoded_tile_size ( opj_tcd_v2_t *p_tcd ) return l_data_size; } -opj_bool opj_tcd_dc_level_shift_encode ( opj_tcd_v2_t *p_tcd ) +OPJ_BOOL opj_tcd_dc_level_shift_encode ( opj_tcd_t *p_tcd ) { OPJ_UINT32 compno; - opj_tcd_tilecomp_v2_t * l_tile_comp = 00; + opj_tcd_tilecomp_t * l_tile_comp = 00; opj_tccp_t * l_tccp = 00; opj_image_comp_t * l_img_comp = 00; - opj_tcp_v2_t * l_tcp = 00; - opj_tcd_tile_v2_t * l_tile; + opj_tcd_tile_t * l_tile; OPJ_UINT32 l_nb_elem,i; OPJ_INT32 * l_current_ptr; l_tile = p_tcd->tcd_image->tiles; l_tile_comp = l_tile->comps; - l_tcp = p_tcd->tcp; l_tccp = p_tcd->tcp->tccps; l_img_comp = p_tcd->image->comps; for (compno = 0; compno < l_tile->numcomps; compno++) { l_current_ptr = l_tile_comp->data; - l_nb_elem = (l_tile_comp->x1 - l_tile_comp->x0) * (l_tile_comp->y1 - l_tile_comp->y0); + l_nb_elem = (OPJ_UINT32)((l_tile_comp->x1 - l_tile_comp->x0) * (l_tile_comp->y1 - l_tile_comp->y0)); if (l_tccp->qmfbid == 1) { for (i = 0; i < l_nb_elem; ++i) { @@ -1837,14 +1851,14 @@ opj_bool opj_tcd_dc_level_shift_encode ( opj_tcd_v2_t *p_tcd ) return OPJ_TRUE; } -opj_bool opj_tcd_mct_encode ( opj_tcd_v2_t *p_tcd ) +OPJ_BOOL opj_tcd_mct_encode ( opj_tcd_t *p_tcd ) { - opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles; - opj_tcd_tilecomp_v2_t * l_tile_comp = p_tcd->tcd_image->tiles->comps; - OPJ_UINT32 samples = (l_tile_comp->x1 - l_tile_comp->x0) * (l_tile_comp->y1 - l_tile_comp->y0); + opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles; + opj_tcd_tilecomp_t * l_tile_comp = p_tcd->tcd_image->tiles->comps; + OPJ_UINT32 samples = (OPJ_UINT32)((l_tile_comp->x1 - l_tile_comp->x0) * (l_tile_comp->y1 - l_tile_comp->y0)); OPJ_UINT32 i; OPJ_BYTE ** l_data = 00; - opj_tcp_v2_t * l_tcp = p_tcd->tcp; + opj_tcp_t * l_tcp = p_tcd->tcp; if(!p_tcd->tcp->mct) { return OPJ_TRUE; @@ -1892,10 +1906,10 @@ opj_bool opj_tcd_mct_encode ( opj_tcd_v2_t *p_tcd ) return OPJ_TRUE; } -opj_bool opj_tcd_dwt_encode ( opj_tcd_v2_t *p_tcd ) +OPJ_BOOL opj_tcd_dwt_encode ( opj_tcd_t *p_tcd ) { - opj_tcd_tile_v2_t * l_tile = p_tcd->tcd_image->tiles; - opj_tcd_tilecomp_v2_t * l_tile_comp = p_tcd->tcd_image->tiles->comps; + opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles; + opj_tcd_tilecomp_t * l_tile_comp = p_tcd->tcd_image->tiles->comps; opj_tccp_t * l_tccp = p_tcd->tcp->tccps; OPJ_UINT32 compno; @@ -1918,11 +1932,11 @@ opj_bool opj_tcd_dwt_encode ( opj_tcd_v2_t *p_tcd ) return OPJ_TRUE; } -opj_bool opj_tcd_t1_encode ( opj_tcd_v2_t *p_tcd ) +OPJ_BOOL opj_tcd_t1_encode ( opj_tcd_t *p_tcd ) { opj_t1_t * l_t1; const OPJ_FLOAT64 * l_mct_norms; - opj_tcp_v2_t * l_tcp = p_tcd->tcp; + opj_tcp_t * l_tcp = p_tcd->tcp; l_t1 = opj_t1_create(); if (l_t1 == 00) { @@ -1952,13 +1966,13 @@ opj_bool opj_tcd_t1_encode ( opj_tcd_v2_t *p_tcd ) return OPJ_TRUE; } -opj_bool opj_tcd_t2_encode (opj_tcd_v2_t *p_tcd, +OPJ_BOOL opj_tcd_t2_encode (opj_tcd_t *p_tcd, OPJ_BYTE * p_dest_data, OPJ_UINT32 * p_data_written, OPJ_UINT32 p_max_dest_size, opj_codestream_info_t *p_cstr_info ) { - opj_t2_v2_t * l_t2; + opj_t2_t * l_t2; l_t2 = opj_t2_create(p_tcd->image, p_tcd->cp); if (l_t2 == 00) { @@ -1990,12 +2004,12 @@ opj_bool opj_tcd_t2_encode (opj_tcd_v2_t *p_tcd, } -opj_bool opj_tcd_rate_allocate_encode( opj_tcd_v2_t *p_tcd, +OPJ_BOOL opj_tcd_rate_allocate_encode( opj_tcd_t *p_tcd, OPJ_BYTE * p_dest_data, OPJ_UINT32 p_max_dest_size, opj_codestream_info_t *p_cstr_info ) { - opj_cp_v2_t * l_cp = p_tcd->cp; + opj_cp_t * l_cp = p_tcd->cp; OPJ_UINT32 l_nb_written = 0; if (p_cstr_info) { @@ -2018,13 +2032,13 @@ opj_bool opj_tcd_rate_allocate_encode( opj_tcd_v2_t *p_tcd, } -opj_bool opj_tcd_copy_tile_data ( opj_tcd_v2_t *p_tcd, +OPJ_BOOL opj_tcd_copy_tile_data ( opj_tcd_t *p_tcd, OPJ_BYTE * p_src, OPJ_UINT32 p_src_length ) { OPJ_UINT32 i,j,l_data_size = 0; opj_image_comp_t * l_img_comp = 00; - opj_tcd_tilecomp_v2_t * l_tilec = 00; + opj_tcd_tilecomp_t * l_tilec = 00; OPJ_UINT32 l_size_comp, l_remaining; OPJ_UINT32 l_nb_elem; @@ -2038,7 +2052,7 @@ opj_bool opj_tcd_copy_tile_data ( opj_tcd_v2_t *p_tcd, for (i=0;iimage->numcomps;++i) { l_size_comp = l_img_comp->prec >> 3; /*(/ 8)*/ l_remaining = l_img_comp->prec & 7; /* (%8) */ - l_nb_elem = (l_tilec->x1 - l_tilec->x0) * (l_tilec->y1 - l_tilec->y0); + l_nb_elem = (OPJ_UINT32)((l_tilec->x1 - l_tilec->x0) * (l_tilec->y1 - l_tilec->y0)); if (l_remaining) { ++l_size_comp;