diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 11:51:07 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 11:51:07 +0000 |
| commit | 35289bffe2c350eae565fd982618f774ca138b57 (patch) | |
| tree | 97868ee1441092fbc4ae473d2a7e9c5e1f8d1b6a | |
| parent | ef00fdf472407c217e4c49ea8241b56ccc68ddec (diff) | |
[trunk] rename opj_create_decompress_v2 to opj_create_decompress
| -rw-r--r-- | applications/codec/j2k_dump.c | 6 | ||||
| -rw-r--r-- | applications/codec/j2k_to_image.c | 6 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.c | 5 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.h | 1 | ||||
| -rw-r--r-- | tests/j2k_random_tile_access.c | 6 | ||||
| -rw-r--r-- | tests/test_tile_decoder.c | 4 |
6 files changed, 12 insertions, 16 deletions
diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c index c41becd3..e908894b 100644 --- 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 ee249967..bb2ff463 100644 --- 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 2904d778..34a234f5 100644 --- 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 11ef06b2..6473b2c8 100644 --- 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 62543753..fa083705 100644 --- 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 4a56041d..45b620ae 100644 --- 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 */
{
/* 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;
}
default:
|