From 05e8aae95e047c262a5bfb377dbe486c08c4121d Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Thu, 9 Aug 2012 15:00:50 +0000 Subject: [PATCH] rename j2k_create_decompress_v2 to opj_j2k_create_decompress --- 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 d27fd31b..b93d37ef 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -10527,7 +10527,7 @@ opj_bool j2k_set_decode_area( opj_j2k_v2_t *p_j2k, * * @return a handle to a J2K decompressor if successful, NULL otherwise. */ -opj_j2k_v2_t* j2k_create_decompress_v2(void) +opj_j2k_v2_t* opj_j2k_create_decompress(void) { opj_j2k_v2_t *l_j2k = (opj_j2k_v2_t*) opj_malloc(sizeof(opj_j2k_v2_t)); if (!l_j2k) { diff --git a/libopenjpeg/j2k.h b/libopenjpeg/j2k.h index 977847e8..6b7d9365 100644 --- a/libopenjpeg/j2k.h +++ b/libopenjpeg/j2k.h @@ -956,7 +956,7 @@ opj_bool j2k_set_decode_area( opj_j2k_v2_t *p_j2k, * * @return a handle to a J2K decompressor if successful, NULL otherwise. */ -opj_j2k_v2_t* j2k_create_decompress_v2(void); +opj_j2k_v2_t* opj_j2k_create_decompress(void); /** diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index dbdf999e..58c70b24 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -3388,7 +3388,7 @@ opj_jp2_v2_t* jp2_create(opj_bool p_is_decoder) jp2->j2k = j2k_create_compress_v2(); } else { - jp2->j2k = j2k_create_decompress_v2(); + jp2->j2k = opj_j2k_create_decompress(); } if (jp2->j2k == 00) { diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index c1d2874d..fc77b00e 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -342,7 +342,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format) OPJ_UINT32 res_factor, struct opj_event_mgr * p_manager)) j2k_set_decoded_resolution_factor; - l_codec->m_codec = j2k_create_decompress_v2(); + l_codec->m_codec = opj_j2k_create_decompress(); if (! l_codec->m_codec) { opj_free(l_codec);