diff options
| author | Antonin Descampe <antonin@gmail.com> | 2014-04-23 07:46:11 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2014-04-23 07:46:11 +0000 |
| commit | 7aece5e8e7d4214d140a45aca50a824ff8092924 (patch) | |
| tree | 85599bd1108ecab5b12fad8dcea894f250b97145 /src/bin/jp2/opj_dump.c | |
| parent | 8d93eae64acd18fac3c856e0a311905359233b96 (diff) | |
[trunk]Replaced deprecated opj_stream_set_user_data function from API
with its 'v3' version, and removed all other 'v3' suffixes from API.
Diffstat (limited to 'src/bin/jp2/opj_dump.c')
| -rw-r--r-- | src/bin/jp2/opj_dump.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/jp2/opj_dump.c b/src/bin/jp2/opj_dump.c index 3121aa4f..7a841d53 100644 --- a/src/bin/jp2/opj_dump.c +++ b/src/bin/jp2/opj_dump.c @@ -498,7 +498,7 @@ int main(int argc, char *argv[]) /* Read the input file and put it in memory */ /* ---------------------------------------- */ - l_stream = opj_stream_create_default_file_stream_v3(parameters.infile,1); + l_stream = opj_stream_create_default_file_stream(parameters.infile,1); if (!l_stream){ fprintf(stderr, "ERROR -> failed to create the stream from the file %s\n",parameters.infile); return EXIT_FAILURE; @@ -528,7 +528,7 @@ int main(int argc, char *argv[]) } default: fprintf(stderr, "skipping file..\n"); - opj_stream_destroy_v3(l_stream); + opj_stream_destroy(l_stream); continue; } @@ -540,7 +540,7 @@ int main(int argc, char *argv[]) /* Setup the decoder decoding parameters using user parameters */ if ( !opj_setup_decoder(l_codec, ¶meters) ){ fprintf(stderr, "ERROR -> opj_dump: failed to setup the decoder\n"); - opj_stream_destroy_v3(l_stream); + opj_stream_destroy(l_stream); opj_destroy_codec(l_codec); fclose(fout); return EXIT_FAILURE; @@ -549,7 +549,7 @@ int main(int argc, char *argv[]) /* Read the main header of the codestream and if necessary the JP2 boxes*/ if(! opj_read_header(l_stream, l_codec, &image)){ fprintf(stderr, "ERROR -> opj_dump: failed to read the header\n"); - opj_stream_destroy_v3(l_stream); + opj_stream_destroy(l_stream); opj_destroy_codec(l_codec); opj_image_destroy(image); fclose(fout); @@ -563,7 +563,7 @@ int main(int argc, char *argv[]) cstr_index = opj_get_cstr_index(l_codec); /* close the byte stream */ - opj_stream_destroy_v3(l_stream); + opj_stream_destroy(l_stream); /* free remaining structures */ if (l_codec) { |