From cf6e5bf01f86084c10ef128a63987a02bb89ab06 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 9 Aug 2012 14:38:55 +0000 Subject: [PATCH] rename jp2_setup_decoder_v2 to opj_jp2_setup_decoder --- libopenjpeg/jp2.c | 2 +- libopenjpeg/jp2.h | 2 +- libopenjpeg/openjpeg.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index 330548c8..eea469ff 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -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 */ j2k_setup_decoder_v2(jp2->j2k, parameters); diff --git a/libopenjpeg/jp2.h b/libopenjpeg/jp2.h index 714ace04..e5466332 100644 --- a/libopenjpeg/jp2.h +++ b/libopenjpeg/jp2.h @@ -298,7 +298,7 @@ Decoding parameters are returned in jp2->j2k->cp. @param jp2 JP2 decompressor handle @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 @param jp2 JP2 decompressor handle diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index 49f379d8..5c06bc41 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -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_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;