From 84c93c2fea82f13734f3ea63c0a13a011b46ddf0 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 15 Nov 2012 12:25:11 +0000 Subject: [PATCH] [trunk] rename public symbols with OPJ_ prefix --- src/lib/openjp2/cio.c | 2 +- src/lib/openjp2/j2k.c | 50 +++++++++++++++++++------------------- src/lib/openjp2/j2k.h | 6 ++--- src/lib/openjp2/openjpeg.c | 2 +- src/lib/openjp2/openjpeg.h | 36 +++++++++++++-------------- src/lib/openjp2/pi.c | 4 +-- src/lib/openjp2/t2.c | 2 +- src/lib/openjp2/tcd.c | 6 ++--- 8 files changed, 53 insertions(+), 55 deletions(-) diff --git a/src/lib/openjp2/cio.c b/src/lib/openjp2/cio.c index 8f08baee..9d3c3880 100644 --- a/src/lib/openjp2/cio.c +++ b/src/lib/openjp2/cio.c @@ -179,7 +179,7 @@ opj_stream_t* OPJ_CALLCONV opj_stream_create(OPJ_SIZE_T p_buffer_size,opj_bool l opj_stream_t* OPJ_CALLCONV opj_stream_default_create(opj_bool l_is_input) { - return opj_stream_create(J2K_STREAM_CHUNK_SIZE,l_is_input); + return opj_stream_create(OPJ_J2K_STREAM_CHUNK_SIZE,l_is_input); } void OPJ_CALLCONV opj_stream_destroy(opj_stream_t* p_stream) diff --git a/src/lib/openjp2/j2k.c b/src/lib/openjp2/j2k.c index bfedd157..6c093847 100644 --- a/src/lib/openjp2/j2k.c +++ b/src/lib/openjp2/j2k.c @@ -2119,25 +2119,25 @@ static opj_bool opj_j2k_read_siz(opj_j2k_t *p_j2k, memset(p_j2k->m_specific_param.m_decoder.m_default_tcp->tccps ,0,l_image->numcomps*sizeof(opj_tccp_t)); p_j2k->m_specific_param.m_decoder.m_default_tcp->m_mct_records = - (opj_mct_data_t*)opj_malloc(J2K_MCT_DEFAULT_NB_RECORDS * sizeof(opj_mct_data_t)); + (opj_mct_data_t*)opj_malloc(OPJ_J2K_MCT_DEFAULT_NB_RECORDS * sizeof(opj_mct_data_t)); if (! p_j2k->m_specific_param.m_decoder.m_default_tcp->m_mct_records) { opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to take in charge SIZ marker\n"); return OPJ_FALSE; } - memset(p_j2k->m_specific_param.m_decoder.m_default_tcp->m_mct_records,0,J2K_MCT_DEFAULT_NB_RECORDS * sizeof(opj_mct_data_t)); - p_j2k->m_specific_param.m_decoder.m_default_tcp->m_nb_max_mct_records = J2K_MCT_DEFAULT_NB_RECORDS; + memset(p_j2k->m_specific_param.m_decoder.m_default_tcp->m_mct_records,0,OPJ_J2K_MCT_DEFAULT_NB_RECORDS * sizeof(opj_mct_data_t)); + p_j2k->m_specific_param.m_decoder.m_default_tcp->m_nb_max_mct_records = OPJ_J2K_MCT_DEFAULT_NB_RECORDS; p_j2k->m_specific_param.m_decoder.m_default_tcp->m_mcc_records = (opj_simple_mcc_decorrelation_data_t*) - opj_malloc(J2K_MCC_DEFAULT_NB_RECORDS * sizeof(opj_simple_mcc_decorrelation_data_t)); + opj_malloc(OPJ_J2K_MCC_DEFAULT_NB_RECORDS * sizeof(opj_simple_mcc_decorrelation_data_t)); if (! p_j2k->m_specific_param.m_decoder.m_default_tcp->m_mcc_records) { opj_event_msg(p_manager, EVT_ERROR, "Not enough memory to take in charge SIZ marker\n"); return OPJ_FALSE; } - memset(p_j2k->m_specific_param.m_decoder.m_default_tcp->m_mcc_records,0,J2K_MCC_DEFAULT_NB_RECORDS * sizeof(opj_simple_mcc_decorrelation_data_t)); - p_j2k->m_specific_param.m_decoder.m_default_tcp->m_nb_max_mcc_records = J2K_MCC_DEFAULT_NB_RECORDS; + memset(p_j2k->m_specific_param.m_decoder.m_default_tcp->m_mcc_records,0,OPJ_J2K_MCC_DEFAULT_NB_RECORDS * sizeof(opj_simple_mcc_decorrelation_data_t)); + p_j2k->m_specific_param.m_decoder.m_default_tcp->m_nb_max_mcc_records = OPJ_J2K_MCC_DEFAULT_NB_RECORDS; /* set up default dc level shift */ for (i=0;inumcomps;++i) { @@ -4979,7 +4979,7 @@ static opj_bool opj_j2k_read_mct ( opj_j2k_t *p_j2k, if (i == l_tcp->m_nb_mct_records) { if (l_tcp->m_nb_mct_records == l_tcp->m_nb_max_mct_records) { opj_mct_data_t *new_mct_records; - l_tcp->m_nb_max_mct_records += J2K_MCT_DEFAULT_NB_RECORDS; + l_tcp->m_nb_max_mct_records += OPJ_J2K_MCT_DEFAULT_NB_RECORDS; new_mct_records = (opj_mct_data_t *) opj_realloc(l_tcp->m_mct_records, l_tcp->m_nb_max_mct_records * sizeof(opj_mct_data_t)); if (! new_mct_records) { @@ -5190,7 +5190,7 @@ opj_bool opj_j2k_read_mcc ( opj_j2k_t *p_j2k, if (i == l_tcp->m_nb_mcc_records) { if (l_tcp->m_nb_mcc_records == l_tcp->m_nb_max_mcc_records) { opj_simple_mcc_decorrelation_data_t *new_mcc_records; - l_tcp->m_nb_max_mcc_records += J2K_MCC_DEFAULT_NB_RECORDS; + l_tcp->m_nb_max_mcc_records += OPJ_J2K_MCC_DEFAULT_NB_RECORDS; new_mcc_records = (opj_simple_mcc_decorrelation_data_t *) opj_realloc( l_tcp->m_mcc_records, l_tcp->m_nb_max_mcc_records * sizeof(opj_simple_mcc_decorrelation_data_t)); @@ -5701,13 +5701,13 @@ opj_j2k_t* opj_j2k_create_compress(void) l_j2k->m_is_decoder = 0; l_j2k->m_cp.m_is_decoder = 0; - l_j2k->m_specific_param.m_encoder.m_header_tile_data = (OPJ_BYTE *) opj_malloc(J2K_DEFAULT_HEADER_SIZE); + l_j2k->m_specific_param.m_encoder.m_header_tile_data = (OPJ_BYTE *) opj_malloc(OPJ_J2K_DEFAULT_HEADER_SIZE); if (! l_j2k->m_specific_param.m_encoder.m_header_tile_data) { opj_j2k_destroy(l_j2k); return NULL; } - l_j2k->m_specific_param.m_encoder.m_header_tile_data_size = J2K_DEFAULT_HEADER_SIZE; + l_j2k->m_specific_param.m_encoder.m_header_tile_data_size = OPJ_J2K_DEFAULT_HEADER_SIZE; /* validation list creation*/ l_j2k->m_validation_list = opj_procedure_list_create(); @@ -6245,7 +6245,7 @@ opj_bool opj_j2k_setup_mct_encoding(opj_tcp_t * p_tcp, opj_image_t * p_image) if (p_tcp->m_mct_decoding_matrix) { if (p_tcp->m_nb_mct_records == p_tcp->m_nb_max_mct_records) { opj_mct_data_t *new_mct_records; - p_tcp->m_nb_max_mct_records += J2K_MCT_DEFAULT_NB_RECORDS; + p_tcp->m_nb_max_mct_records += OPJ_J2K_MCT_DEFAULT_NB_RECORDS; new_mct_records = (opj_mct_data_t *) opj_realloc(p_tcp->m_mct_records, p_tcp->m_nb_max_mct_records * sizeof(opj_mct_data_t)); if (! new_mct_records) { @@ -6287,7 +6287,7 @@ opj_bool opj_j2k_setup_mct_encoding(opj_tcp_t * p_tcp, opj_image_t * p_image) if (p_tcp->m_nb_mct_records == p_tcp->m_nb_max_mct_records) { opj_mct_data_t *new_mct_records; - p_tcp->m_nb_max_mct_records += J2K_MCT_DEFAULT_NB_RECORDS; + p_tcp->m_nb_max_mct_records += OPJ_J2K_MCT_DEFAULT_NB_RECORDS; new_mct_records = (opj_mct_data_t *) opj_realloc(p_tcp->m_mct_records, p_tcp->m_nb_max_mct_records * sizeof(opj_mct_data_t)); if (! new_mct_records) { opj_free(p_tcp->m_mct_records); @@ -6350,7 +6350,7 @@ opj_bool opj_j2k_setup_mct_encoding(opj_tcp_t * p_tcp, opj_image_t * p_image) if (p_tcp->m_nb_mcc_records == p_tcp->m_nb_max_mcc_records) { opj_simple_mcc_decorrelation_data_t *new_mcc_records; - p_tcp->m_nb_max_mcc_records += J2K_MCT_DEFAULT_NB_RECORDS; + p_tcp->m_nb_max_mcc_records += OPJ_J2K_MCT_DEFAULT_NB_RECORDS; new_mcc_records = (opj_simple_mcc_decorrelation_data_t *) opj_realloc( p_tcp->m_mcc_records, p_tcp->m_nb_max_mcc_records * sizeof(opj_simple_mcc_decorrelation_data_t)); if (! new_mcc_records) { @@ -7686,13 +7686,13 @@ opj_j2k_t* opj_j2k_create_decompress(void) } memset(l_j2k->m_specific_param.m_decoder.m_default_tcp,0,sizeof(opj_tcp_t)); - l_j2k->m_specific_param.m_decoder.m_header_data = (OPJ_BYTE *) opj_malloc(J2K_DEFAULT_HEADER_SIZE); + l_j2k->m_specific_param.m_decoder.m_header_data = (OPJ_BYTE *) opj_malloc(OPJ_J2K_DEFAULT_HEADER_SIZE); if (! l_j2k->m_specific_param.m_decoder.m_header_data) { opj_j2k_destroy(l_j2k); return 00; } - l_j2k->m_specific_param.m_decoder.m_header_data_size = J2K_DEFAULT_HEADER_SIZE; + l_j2k->m_specific_param.m_decoder.m_header_data_size = OPJ_J2K_DEFAULT_HEADER_SIZE; l_j2k->m_specific_param.m_decoder.m_tile_ind_to_dec = -1 ; @@ -8133,10 +8133,10 @@ opj_bool opj_j2k_read_SQcd_SQcc(opj_j2k_t *p_j2k, (*p_header_size) : (*p_header_size) / 2; - if( l_num_band > J2K_MAXBANDS ) { + if( l_num_band > OPJ_J2K_MAXBANDS ) { opj_event_msg(p_manager, EVT_WARNING, "While reading CCP_QNTSTY element inside QCD or QCC marker segment, " - "number of subbands (%d) is greater to J2K_MAXBANDS (%d). So we limit the number of elements stored to " - "J2K_MAXBANDS (%d) and skip the rest. \n", l_num_band, J2K_MAXBANDS, J2K_MAXBANDS); + "number of subbands (%d) is greater to OPJ_J2K_MAXBANDS (%d). So we limit the number of elements stored to " + "OPJ_J2K_MAXBANDS (%d) and skip the rest. \n", l_num_band, OPJ_J2K_MAXBANDS, OPJ_J2K_MAXBANDS); /*return OPJ_FALSE;*/ } } @@ -8145,7 +8145,7 @@ opj_bool opj_j2k_read_SQcd_SQcc(opj_j2k_t *p_j2k, if (l_cp->correct) { /* if JPWL is on, we check whether there are too many subbands */ - if (/*(l_num_band < 0) ||*/ (l_num_band >= J2K_MAXBANDS)) { + if (/*(l_num_band < 0) ||*/ (l_num_band >= OPJ_J2K_MAXBANDS)) { opj_event_msg(p_manager, JPWL_ASSUME ? EVT_WARNING : EVT_ERROR, "JPWL: bad number of subbands in Sqcx (%d)\n", l_num_band); @@ -8167,7 +8167,7 @@ opj_bool opj_j2k_read_SQcd_SQcc(opj_j2k_t *p_j2k, for (l_band_no = 0; l_band_no < l_num_band; l_band_no++) { opj_read_bytes(l_current_ptr, &l_tmp ,1); /* SPqcx_i */ ++l_current_ptr; - if (l_band_no < J2K_MAXBANDS){ + if (l_band_no < OPJ_J2K_MAXBANDS){ l_tccp->stepsizes[l_band_no].expn = l_tmp>>3; l_tccp->stepsizes[l_band_no].mant = 0; } @@ -8178,7 +8178,7 @@ opj_bool opj_j2k_read_SQcd_SQcc(opj_j2k_t *p_j2k, for (l_band_no = 0; l_band_no < l_num_band; l_band_no++) { opj_read_bytes(l_current_ptr, &l_tmp ,2); /* SPqcx_i */ l_current_ptr+=2; - if (l_band_no < J2K_MAXBANDS){ + if (l_band_no < OPJ_J2K_MAXBANDS){ l_tccp->stepsizes[l_band_no].expn = l_tmp >> 11; l_tccp->stepsizes[l_band_no].mant = l_tmp & 0x7ff; } @@ -8188,7 +8188,7 @@ opj_bool opj_j2k_read_SQcd_SQcc(opj_j2k_t *p_j2k, /* Add Antonin : if scalar_derived -> compute other stepsizes */ if (l_tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) { - for (l_band_no = 1; l_band_no < J2K_MAXBANDS; l_band_no++) { + for (l_band_no = 1; l_band_no < OPJ_J2K_MAXBANDS; l_band_no++) { l_tccp->stepsizes[l_band_no].expn = ((l_tccp->stepsizes[0].expn) - ((l_band_no - 1) / 3) > 0) ? (l_tccp->stepsizes[0].expn) - ((l_band_no - 1) / 3) : 0; @@ -8218,7 +8218,7 @@ void opj_j2k_copy_tile_quantization_parameters( opj_j2k_t *p_j2k ) l_ref_tccp = &l_tcp->tccps[0]; l_copied_tccp = l_ref_tccp + 1; - l_size = J2K_MAXBANDS * sizeof(opj_stepsize_t); + l_size = OPJ_J2K_MAXBANDS * sizeof(opj_stepsize_t); for (i=1;im_private_image->numcomps;++i) { l_copied_tccp->qntsty = l_ref_tccp->qntsty; @@ -8492,7 +8492,7 @@ opj_codestream_info_v2_t* j2k_get_cstr_info(opj_j2k_t* p_j2k) l_tccp_info->cblkh = l_tccp->cblkh; l_tccp_info->cblksty = l_tccp->cblksty; l_tccp_info->qmfbid = l_tccp->qmfbid; - if (l_tccp->numresolutions < J2K_MAXRLVLS) + if (l_tccp->numresolutions < OPJ_J2K_MAXRLVLS) { memcpy(l_tccp_info->prch, l_tccp->prch, l_tccp->numresolutions); memcpy(l_tccp_info->prcw, l_tccp->prcw, l_tccp->numresolutions); @@ -8503,7 +8503,7 @@ opj_codestream_info_v2_t* j2k_get_cstr_info(opj_j2k_t* p_j2k) l_tccp_info->numgbits = l_tccp->numgbits; numbands = (l_tccp->qntsty == J2K_CCP_QNTSTY_SIQNT) ? 1 : l_tccp->numresolutions * 3 - 2; - if (numbands < J2K_MAXBANDS) { + if (numbands < OPJ_J2K_MAXBANDS) { for (bandno = 0; bandno < numbands; bandno++) { l_tccp_info->stepsizes_mant[bandno] = l_tccp->stepsizes[bandno].mant; l_tccp_info->stepsizes_expn[bandno] = l_tccp->stepsizes[bandno].expn; diff --git a/src/lib/openjp2/j2k.h b/src/lib/openjp2/j2k.h index 7265f06b..0087dc1d 100644 --- a/src/lib/openjp2/j2k.h +++ b/src/lib/openjp2/j2k.h @@ -181,15 +181,15 @@ typedef struct opj_tccp /** quantisation style */ OPJ_UINT32 qntsty; /** stepsizes used for quantization */ - opj_stepsize_t stepsizes[J2K_MAXBANDS]; + opj_stepsize_t stepsizes[OPJ_J2K_MAXBANDS]; /** number of guard bits */ OPJ_UINT32 numgbits; /** Region Of Interest shift */ OPJ_INT32 roishift; /** precinct width */ - OPJ_UINT32 prcw[J2K_MAXRLVLS]; + OPJ_UINT32 prcw[OPJ_J2K_MAXRLVLS]; /** precinct height */ - OPJ_UINT32 prch[J2K_MAXRLVLS]; + OPJ_UINT32 prch[OPJ_J2K_MAXRLVLS]; /** the dc_level_shift **/ OPJ_INT32 m_dc_level_shift; } diff --git a/src/lib/openjp2/openjpeg.c b/src/lib/openjp2/openjpeg.c index 85ddc7e9..ad81630e 100644 --- a/src/lib/openjp2/openjpeg.c +++ b/src/lib/openjp2/openjpeg.c @@ -1033,7 +1033,7 @@ void OPJ_CALLCONV opj_destroy_cstr_index(opj_codestream_index_t **p_cstr_index) /* ---------------------------------------------------------------------- */ opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream (FILE * p_file, opj_bool p_is_read_stream) { - return opj_stream_create_file_stream(p_file,J2K_STREAM_CHUNK_SIZE,p_is_read_stream); + return opj_stream_create_file_stream(p_file,OPJ_J2K_STREAM_CHUNK_SIZE,p_is_read_stream); } opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream ( FILE * p_file, diff --git a/src/lib/openjp2/openjpeg.h b/src/lib/openjp2/openjpeg.h index 9efd4878..65918be5 100644 --- a/src/lib/openjp2/openjpeg.h +++ b/src/lib/openjp2/openjpeg.h @@ -110,14 +110,14 @@ typedef uint64_t OPJ_UINT64; #define OPJ_PATH_LEN 4096 /**< Maximum allowed size for filenames */ -#define J2K_MAXRLVLS 33 /**< Number of maximum resolution level authorized */ -#define J2K_MAXBANDS (3*J2K_MAXRLVLS-2) /**< Number of maximum sub-band linked to number of resolution level */ +#define OPJ_J2K_MAXRLVLS 33 /**< Number of maximum resolution level authorized */ +#define OPJ_J2K_MAXBANDS (3*OPJ_J2K_MAXRLVLS-2) /**< Number of maximum sub-band linked to number of resolution level */ -#define J2K_DEFAULT_NB_SEGS 10 -#define J2K_STREAM_CHUNK_SIZE 0x100000 /** 1 mega by default */ -#define J2K_DEFAULT_HEADER_SIZE 1000 -#define J2K_MCC_DEFAULT_NB_RECORDS 10 -#define J2K_MCT_DEFAULT_NB_RECORDS 10 +#define OPJ_J2K_DEFAULT_NB_SEGS 10 +#define OPJ_J2K_STREAM_CHUNK_SIZE 0x100000 /** 1 mega by default */ +#define OPJ_J2K_DEFAULT_HEADER_SIZE 1000 +#define OPJ_J2K_MCC_DEFAULT_NB_RECORDS 10 +#define OPJ_J2K_MCT_DEFAULT_NB_RECORDS 10 /* UniPG>> */ #define JPWL_MAX_NO_TILESPECS 16 /**< Maximum number of tile parts expected by JPWL: increase at your will */ @@ -221,8 +221,8 @@ typedef enum LIMIT_DECODING { /** * Callback function prototype for events - * @param msg Event message - * @param client_data + * @param msg Event message + * @param client_data FIXME DOC * */ typedef void (*opj_msg_callback) (const char *msg, void *client_data); @@ -316,9 +316,9 @@ typedef struct opj_cparameters { /* number of precinct size specifications */ int res_spec; /** initial precinct width */ - int prcw_init[J2K_MAXRLVLS]; + int prcw_init[OPJ_J2K_MAXRLVLS]; /** initial precinct height */ - int prch_init[J2K_MAXRLVLS]; + int prch_init[OPJ_J2K_MAXRLVLS]; /**@name command line encoder parameters (not used inside the library) */ /*@{*/ @@ -407,14 +407,14 @@ typedef struct opj_dparameters { if != 0, then original dimension divided by 2^(reduce); if == 0 or not used, image is decoded to the full resolution */ - int cp_reduce; + OPJ_UINT32 cp_reduce; /** Set the maximum number of quality layers to decode. If there are less quality layers than the specified number, all the quality layers are decoded. if != 0, then only the first "layer" layers are decoded; if == 0 or not used, all the quality layers are decoded */ - int cp_layer; + OPJ_UINT32 cp_layer; /**@name command line decoder parameters (not used inside the library) */ /*@{*/ @@ -773,17 +773,17 @@ typedef struct opj_tccp_info /** quantisation style */ OPJ_UINT32 qntsty; /** stepsizes used for quantization */ - OPJ_UINT32 stepsizes_mant[J2K_MAXBANDS]; + OPJ_UINT32 stepsizes_mant[OPJ_J2K_MAXBANDS]; /** stepsizes used for quantization */ - OPJ_UINT32 stepsizes_expn[J2K_MAXBANDS]; + OPJ_UINT32 stepsizes_expn[OPJ_J2K_MAXBANDS]; /** number of guard bits */ OPJ_UINT32 numgbits; /** Region Of Interest shift */ OPJ_INT32 roishift; /** precinct width */ - OPJ_UINT32 prcw[J2K_MAXRLVLS]; + OPJ_UINT32 prcw[OPJ_J2K_MAXRLVLS]; /** precinct height */ - OPJ_UINT32 prch[J2K_MAXRLVLS]; + OPJ_UINT32 prch[OPJ_J2K_MAXRLVLS]; } opj_tccp_info_t; @@ -1078,8 +1078,6 @@ OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_default_file_stream (FILE * */ OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream (FILE * p_file, OPJ_SIZE_T p_buffer_size, opj_bool p_is_read_stream); -/* -----------> */ - /* ========================================================== event manager functions definitions diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c index 62e4725d..b096dd0c 100644 --- a/src/lib/openjp2/pi.c +++ b/src/lib/openjp2/pi.c @@ -1181,7 +1181,7 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image, l_tcp = &p_cp->tcps[p_tile_no]; l_bound = l_tcp->numpocs+1; - l_data_stride = 4 * J2K_MAXRLVLS; + l_data_stride = 4 * OPJ_J2K_MAXRLVLS; l_tmp_data = (OPJ_UINT32*)opj_malloc( l_data_stride * p_image->numcomps * sizeof(OPJ_UINT32)); if @@ -1383,7 +1383,7 @@ opj_pi_iterator_t *opj_pi_initialise_encode(const opj_image_t *p_image, l_tcp = &p_cp->tcps[p_tile_no]; l_bound = l_tcp->numpocs+1; - l_data_stride = 4 * J2K_MAXRLVLS; + l_data_stride = 4 * OPJ_J2K_MAXRLVLS; l_tmp_data = (OPJ_UINT32*)opj_malloc( l_data_stride * p_image->numcomps * sizeof(OPJ_UINT32)); if (! l_tmp_data) { diff --git a/src/lib/openjp2/t2.c b/src/lib/openjp2/t2.c index d1a3ff44..56cd8493 100644 --- a/src/lib/openjp2/t2.c +++ b/src/lib/openjp2/t2.c @@ -1256,7 +1256,7 @@ opj_bool opj_t2_init_seg( opj_tcd_cblk_dec_t* cblk, if (l_nb_segs > cblk->m_current_max_segs) { opj_tcd_seg_t* new_segs; - cblk->m_current_max_segs += J2K_DEFAULT_NB_SEGS; + cblk->m_current_max_segs += OPJ_J2K_DEFAULT_NB_SEGS; new_segs = (opj_tcd_seg_t*) opj_realloc(cblk->segs, cblk->m_current_max_segs * sizeof(opj_tcd_seg_t)); if(! new_segs) { diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c index 6a1ed05b..88d77199 100644 --- a/src/lib/openjp2/tcd.c +++ b/src/lib/openjp2/tcd.c @@ -1040,15 +1040,15 @@ opj_bool opj_tcd_code_block_dec_allocate (opj_tcd_cblk_dec_t * p_code_block) } /*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 */