walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

rename j2k_setup_decoder_v2 to opj_j2k_setup_decoder

This commit is contained in:
Mickael Savinaud 2012-08-09 15:08:33 +00:00
parent 3ce9af7fce
commit 71e0106846
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libopenjpeg/j2k.c
View File

@ -7674,7 +7674,7 @@ void j2k_destroy_decompress(opj_j2k_t *j2k) {
}
void j2k_setup_decoder_v2(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters)
void opj_j2k_setup_decoder(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters)
{
if(j2k && parameters) {
j2k->m_cp.m_specific_param.m_dec.m_layer = parameters->cp_layer;

2
libopenjpeg/j2k.h
View File

@ -790,7 +790,7 @@ Decoding parameters are returned in j2k->cp.
@param j2k J2K decompressor handle
@param parameters decompression parameters
*/
void j2k_setup_decoder_v2(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters);
void opj_j2k_setup_decoder(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters);
/**
Decode an image from a JPEG-2000 codestream

2
libopenjpeg/jp2.c
View File

@ -2246,7 +2246,7 @@ void jp2_destroy_decompress(opj_jp2_t *jp2) {
void opj_jp2_setup_decoder(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters)
{
/* setup the J2K codec */
j2k_setup_decoder_v2(jp2->j2k, parameters);
opj_j2k_setup_decoder(jp2->j2k, parameters);
/* further JP2 initializations go here */
jp2->color.jp2_has_colr = 0;

2
libopenjpeg/openjpeg.c
View File

@ -313,7 +313,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
(void (*) (void *))j2k_destroy;
l_codec->m_codec_data.m_decompression.opj_setup_decoder =
(void (*) (void * , opj_dparameters_t * )) j2k_setup_decoder_v2;
(void (*) (void * , opj_dparameters_t * )) opj_j2k_setup_decoder;
l_codec->m_codec_data.m_decompression.opj_read_tile_header =
(opj_bool (*) ( void *,