From 71e0106846294256faa3df75429e0a9ecd163233 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 9 Aug 2012 15:08:33 +0000 Subject: [PATCH] rename j2k_setup_decoder_v2 to opj_j2k_setup_decoder --- libopenjpeg/j2k.c | 2 +- libopenjpeg/j2k.h | 2 +- libopenjpeg/jp2.c | 2 +- libopenjpeg/openjpeg.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index 5166ce8f..509b627f 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -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; diff --git a/libopenjpeg/j2k.h b/libopenjpeg/j2k.h index 28d13974..2658f699 100644 --- a/libopenjpeg/j2k.h +++ b/libopenjpeg/j2k.h @@ -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 diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index 58c70b24..73596295 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -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; diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index fc77b00e..59138519 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -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 *, -- 2.30.2