[trunk] rename opj_setup_decoder_v2 to opj_setup_decoder

This commit is contained in:
Mickael Savinaud 2012-08-09 12:11:24 +00:00
parent b34215906c
commit 52f414669a
6 changed files with 9 additions and 9 deletions

View File

@ -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, &parameters) ){
if ( !opj_setup_decoder(l_codec, &parameters) ){
fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n");
opj_stream_destroy(l_stream);
fclose(fsrc);

View File

@ -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, &parameters) ){
if ( !opj_setup_decoder(l_codec, &parameters) ){
fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n");
opj_stream_destroy(l_stream);
fclose(fsrc);

View File

@ -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;

View File

@ -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.

View File

@ -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, &parameters) ){
if ( !opj_setup_decoder(l_codec, &parameters) ){
fprintf(stderr, "ERROR -> j2k_dump: failed to setup the decoder\n");
opj_stream_destroy(l_stream);
fclose(fsrc);

View File

@ -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);