remove deprecated v1 style function j2k_create_compress; rename opj_j2k_create_compre...

diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index eaa75548091fc098d319f7a59d4d56c2da4e3e63..aec5d188e7a80aefcb32fdd83234105cec151565 100644 (file)
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -6064,15 +6064,7 @@ void opj_j2k_setup_decoder(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters)
 /* J2K encoder interface                                                       */
 /* ----------------------------------------------------------------------- */
 
-opj_j2k_t* j2k_create_compress(opj_common_ptr cinfo) {
-       opj_j2k_t *j2k = (opj_j2k_t*) opj_calloc(1, sizeof(opj_j2k_t));
-       if(j2k) {
-               j2k->cinfo = cinfo;
-       }
-       return j2k;
-}
-
-opj_j2k_v2_t* opj_j2k_create_compress_v2(void)
+opj_j2k_v2_t* opj_j2k_create_compress(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 e8f35fcf12ec9232fab4f5352e5250b0fbce1627..e2fe9355009d2808f24f324a5c50181e82127144 100644 (file)
--- a/libopenjpeg/j2k.h
+++ b/libopenjpeg/j2k.h
@@ -792,14 +792,7 @@ Creates a J2K compression structure
 @param cinfo Codec context info
 @return Returns a handle to a J2K compressor if successful, returns NULL otherwise
 */
-opj_j2k_t* j2k_create_compress(opj_common_ptr cinfo);
-
-/**
-Creates a J2K compression structure
-@param cinfo Codec context info
-@return Returns a handle to a J2K compressor if successful, returns NULL otherwise
-*/
-opj_j2k_v2_t* opj_j2k_create_compress_v2(void);
+opj_j2k_v2_t* opj_j2k_create_compress(void);
 
 
 void opj_j2k_setup_encoder(    opj_j2k_v2_t *p_j2k,

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index 7e6a373efc7fb77fd3d4412bed483d5436663328..22034bc34ad3e480c0321129ec4510770ddaedce 100644 (file)
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -2559,7 +2559,7 @@ opj_jp2_v2_t* opj_jp2_create(opj_bool p_is_decoder)
 
                /* create the J2K codec */
                if (! p_is_decoder) {
-                       jp2->j2k = opj_j2k_create_compress_v2();
+                       jp2->j2k = opj_j2k_create_compress();
                }
                else {
                        jp2->j2k = opj_j2k_create_decompress();

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 93653f49dc42dfb3093024067596dec1e845a27d..2c2941fb8cd52e23d4b4c0f07c42797ea785f4a8 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -751,7 +751,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format)
                                                                                                                                                                struct opj_image *,
                                                                                                                                                                struct opj_event_mgr * )) opj_j2k_setup_encoder;
 
-                       l_codec->m_codec = opj_j2k_create_compress_v2();
+                       l_codec->m_codec = opj_j2k_create_compress();
                        if (! l_codec->m_codec) {
                                opj_free(l_codec);
                                return 00;