rename j2k_create_decompress_v2 to opj_j2k_create_decompress

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index d27fd31b7b8af62c9195b6aae0a6198c37e812ad..b93d37ef40f47083daba5800d1f2bb0dc4c7c02e 100644 (file)
--- 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 977847e86f352b87d2c7ca6e7f5aeb377e282434..6b7d9365ef67148467183c8fd482605a424fcde3 100644 (file)
--- 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 dbdf999ece8ea2d01822ff0703a83f2c78e8668a..58c70b2433d156774973c60a1f7fdee90990944b 100644 (file)
--- 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 c1d2874d0829f47c3319a281f9c8bc616029de1d..fc77b00eba0b1066dcba1f69447e695303f75073 100644 (file)
--- 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);