diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 12:11:24 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 12:11:24 +0000 |
| commit | 52f414669a854c7c719b768c2a1792c055ff22c8 (patch) | |
| tree | ee96d7324cdec957b47f15d49c11e2a99d580009 | |
| parent | b34215906c31fd1bf7ef5fd5772b43758ecc8079 (diff) | |
[trunk] rename opj_setup_decoder_v2 to opj_setup_decoder
| -rw-r--r-- | applications/codec/j2k_dump.c | 2 | ||||
| -rw-r--r-- | applications/codec/j2k_to_image.c | 2 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.c | 6 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.h | 4 | ||||
| -rw-r--r-- | tests/j2k_random_tile_access.c | 2 | ||||
| -rw-r--r-- | tests/test_tile_decoder.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/applications/codec/j2k_dump.c b/applications/codec/j2k_dump.c index e908894b..8a268867 100644 --- a/applications/codec/j2k_dump.c +++ b/applications/codec/j2k_dump.c @@ -532,7 +532,7 @@ int main(int argc, char *argv[]) opj_set_error_handler(l_codec, error_callback,00); /* Setup the decoder decoding parameters using user parameters */ - if ( !opj_setup_decoder_v2(l_codec, ¶meters) ){ + if ( !opj_setup_decoder(l_codec, ¶meters) ){ fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n"); opj_stream_destroy(l_stream); fclose(fsrc); diff --git a/applications/codec/j2k_to_image.c b/applications/codec/j2k_to_image.c index bb2ff463..88917352 100644 --- a/applications/codec/j2k_to_image.c +++ b/applications/codec/j2k_to_image.c @@ -786,7 +786,7 @@ int main(int argc, char **argv) opj_set_error_handler(l_codec, error_callback,00); /* Setup the decoder decoding parameters using user parameters */ - if ( !opj_setup_decoder_v2(l_codec, ¶meters) ){ + if ( !opj_setup_decoder(l_codec, ¶meters) ){ fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n"); opj_stream_destroy(l_stream); fclose(fsrc); diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index 04f83165..91dcfbbb 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -457,9 +457,9 @@ void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *paramete } } -opj_bool OPJ_CALLCONV opj_setup_decoder_v2( opj_codec_t *p_codec, - opj_dparameters_t *parameters - ) +opj_bool OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec, + opj_dparameters_t *parameters + ) { if (p_codec && parameters) { opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec; diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h index 0b401ba2..108c5071 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -1230,8 +1230,8 @@ OPJ_API void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t * * * @return true if the decoder is correctly set */ -OPJ_API opj_bool OPJ_CALLCONV opj_setup_decoder_v2( opj_codec_t *p_codec, - opj_dparameters_t *parameters ); +OPJ_API opj_bool OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec, + opj_dparameters_t *parameters ); /** * Decodes an image header. diff --git a/tests/j2k_random_tile_access.c b/tests/j2k_random_tile_access.c index fa083705..123207f9 100644 --- a/tests/j2k_random_tile_access.c +++ b/tests/j2k_random_tile_access.c @@ -230,7 +230,7 @@ int main(int argc, char **argv) } /* Setup the decoder decoding parameters using user parameters */ - if ( !opj_setup_decoder_v2(l_codec, ¶meters) ){ + if ( !opj_setup_decoder(l_codec, ¶meters) ){ fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n"); opj_stream_destroy(l_stream); fclose(fsrc); diff --git a/tests/test_tile_decoder.c b/tests/test_tile_decoder.c index 45b620ae..84293586 100644 --- a/tests/test_tile_decoder.c +++ b/tests/test_tile_decoder.c @@ -281,7 +281,7 @@ int main (int argc, char *argv[]) opj_set_error_handler(l_codec, error_callback,00); /* Setup the decoder decoding parameters using user parameters */ - if (! opj_setup_decoder_v2(l_codec, &l_param)) + if (! opj_setup_decoder(l_codec, &l_param)) { fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n"); fclose(l_file); |