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

rename jp2_setup_decoder_v2 to opj_jp2_setup_decoder

This commit is contained in:
Mickael Savinaud 2012-08-09 14:38:55 +00:00
parent 958c615a83
commit cf6e5bf01f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libopenjpeg/jp2.c
View File

@ -2323,7 +2323,7 @@ void jp2_destroy_decompress(opj_jp2_t *jp2) {
} }
void jp2_setup_decoder_v2(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters) void opj_jp2_setup_decoder(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters)
{ {
/* setup the J2K codec */ /* setup the J2K codec */
j2k_setup_decoder_v2(jp2->j2k, parameters); j2k_setup_decoder_v2(jp2->j2k, parameters);

2
libopenjpeg/jp2.h
View File

@ -298,7 +298,7 @@ Decoding parameters are returned in jp2->j2k->cp.
@param jp2 JP2 decompressor handle @param jp2 JP2 decompressor handle
@param parameters decompression parameters @param parameters decompression parameters
*/ */
void jp2_setup_decoder_v2(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters); void opj_jp2_setup_decoder(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters);
/** /**
Decode an image from a JPEG-2000 file stream Decode an image from a JPEG-2000 file stream
@param jp2 JP2 decompressor handle @param jp2 JP2 decompressor handle

2
libopenjpeg/openjpeg.c
View File

@ -390,7 +390,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
l_codec->m_codec_data.m_decompression.opj_destroy = (void (*) (void *))jp2_destroy; l_codec->m_codec_data.m_decompression.opj_destroy = (void (*) (void *))jp2_destroy;
l_codec->m_codec_data.m_decompression.opj_setup_decoder = (void (*) (void * ,opj_dparameters_t * )) jp2_setup_decoder_v2; l_codec->m_codec_data.m_decompression.opj_setup_decoder = (void (*) (void * ,opj_dparameters_t * )) opj_jp2_setup_decoder;
l_codec->m_codec_data.m_decompression.opj_set_decode_area = (opj_bool (*) (void *,opj_image_t*, OPJ_INT32,OPJ_INT32,OPJ_INT32,OPJ_INT32, struct opj_event_mgr * )) jp2_set_decode_area; l_codec->m_codec_data.m_decompression.opj_set_decode_area = (opj_bool (*) (void *,opj_image_t*, OPJ_INT32,OPJ_INT32,OPJ_INT32,OPJ_INT32, struct opj_event_mgr * )) jp2_set_decode_area;