[trunk] rename opj_create_decompress_v2 to opj_create_decompress

diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c
index c41becd3a2386fc2577f1513ed27631b4b4af514..e908894b26e55c0c5734e93eb8c00c09867292bd 100644 (file)
--- a/applications/codec/j2k_dump.c
+++ b/applications/codec/j2k_dump.c
@@ -505,19 +505,19 @@ int main(int argc, char *argv[])
                        case J2K_CFMT:  /* JPEG-2000 codestream */
                        {
                                /* Get a decoder handle */
-                               l_codec = opj_create_decompress_v2(CODEC_J2K);
+                               l_codec = opj_create_decompress(CODEC_J2K);
                                break;
                        }
                        case JP2_CFMT:  /* JPEG 2000 compressed image data */
                        {
                                /* Get a decoder handle */
-                               l_codec = opj_create_decompress_v2(CODEC_JP2);
+                               l_codec = opj_create_decompress(CODEC_JP2);
                                break;
                        }
                        case JPT_CFMT:  /* JPEG 2000, JPIP */
                        {
                                /* Get a decoder handle */
-                               l_codec = opj_create_decompress_v2(CODEC_JPT);
+                               l_codec = opj_create_decompress(CODEC_JPT);
                                break;
                        }
                        default:

diff --git a/applications/codec/j2k_to_image.c b/applications/codec/j2k_to_image.c
index ee249967690bdaeb06e9fac8af106233cde07a3f..bb2ff4639fda279a624c20b5f173a38e47eddf54 100644 (file)
--- a/applications/codec/j2k_to_image.c
+++ b/applications/codec/j2k_to_image.c
@@ -759,19 +759,19 @@ int main(int argc, char **argv)
                        case J2K_CFMT:  /* JPEG-2000 codestream */
                        {
                                /* Get a decoder handle */
-                               l_codec = opj_create_decompress_v2(CODEC_J2K);
+                               l_codec = opj_create_decompress(CODEC_J2K);
                                break;
                        }
                        case JP2_CFMT:  /* JPEG 2000 compressed image data */
                        {
                                /* Get a decoder handle */
-                               l_codec = opj_create_decompress_v2(CODEC_JP2);
+                               l_codec = opj_create_decompress(CODEC_JP2);
                                break;
                        }
                        case JPT_CFMT:  /* JPEG 2000, JPIP */
                        {
                                /* Get a decoder handle */
-                               l_codec = opj_create_decompress_v2(CODEC_JPT);
+                               l_codec = opj_create_decompress(CODEC_JPT);
                                break;
                        }
                        default:

diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 2904d778867f9e7ea7bf003b00ae9b4fefecebac..34a234f56f87563eda722b3a16511bfe640f99a3 100644 (file)
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -286,10 +286,7 @@ const char* OPJ_CALLCONV opj_version(void) {
     return PACKAGE_VERSION;
 }
 
-
-
-
-opj_codec_t* OPJ_CALLCONV opj_create_decompress_v2(OPJ_CODEC_FORMAT p_format)
+opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
 {
        opj_codec_private_t *l_codec = 00;
 

diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index 11ef06b23e4187630d06bed88406ff271d62cdf5..6473b2c8a89c19b001b4cc246457a7900ae69e49 100644 (file)
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -1191,7 +1191,6 @@ DEPRECATED( OPJ_API opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_p
 ==========================================================
 */
 
-
 /**
  * Creates a J2K/JP2 decompression structure
  * @param format               Decoder to select

diff --git a/tests/j2k_random_tile_access.c b/tests/j2k_random_tile_access.c
index 6254375387479f55c638d0a47cd417e854bb9d82..fa08370522af48082da57cfc11ab5e8017f1b48b 100644 (file)
--- a/tests/j2k_random_tile_access.c
+++ b/tests/j2k_random_tile_access.c
@@ -195,19 +195,19 @@ int main(int argc, char **argv)
                case J2K_CFMT:  /* JPEG-2000 codestream */
                {
                        /* Get a decoder handle */
-                       l_codec = opj_create_decompress_v2(CODEC_J2K);
+                       l_codec = opj_create_decompress(CODEC_J2K);
                        break;
                }
                case JP2_CFMT:  /* JPEG 2000 compressed image data */
                {
                        /* Get a decoder handle */
-                       l_codec = opj_create_decompress_v2(CODEC_JP2);
+                       l_codec = opj_create_decompress(CODEC_JP2);
                        break;
                }
                case JPT_CFMT:  /* JPEG 2000, JPIP */
                {
                        /* Get a decoder handle */
-                       l_codec = opj_create_decompress_v2(CODEC_JPT);
+                       l_codec = opj_create_decompress(CODEC_JPT);
                        break;
                }
                default:

diff --git a/tests/test_tile_decoder.c b/tests/test_tile_decoder.c
index 4a56041dfc841bdb77801e4032824448c318ca52..45b620ae63fa407e9f01990c27c45d033f42669c 100644 (file)
--- a/tests/test_tile_decoder.c
+++ b/tests/test_tile_decoder.c
@@ -256,13 +256,13 @@ int main (int argc, char *argv[])
         case J2K_CFMT: /* JPEG-2000 codestream */\r
         {\r
             /* Get a decoder handle */\r
-            l_codec = opj_create_decompress_v2(CODEC_J2K);\r
+            l_codec = opj_create_decompress(CODEC_J2K);\r
             break;\r
         }\r
         case JP2_CFMT: /* JPEG 2000 compressed image data */\r
         {\r
             /* Get a decoder handle */\r
-            l_codec = opj_create_decompress_v2(CODEC_JP2);\r
+            l_codec = opj_create_decompress(CODEC_JP2);\r
             break;\r
         }\r
         default:\r