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 /tests/j2k_random_tile_access.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 'tests/j2k_random_tile_access.c')
| -rw-r--r-- | tests/j2k_random_tile_access.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/j2k_random_tile_access.c b/tests/j2k_random_tile_access.c index b76bf359..b53c6005 100644 --- a/tests/j2k_random_tile_access.c +++ b/tests/j2k_random_tile_access.c @@ -209,7 +209,7 @@ int main(int argc, char **argv) opj_set_warning_handler(l_codec, warning_callback,00); opj_set_error_handler(l_codec, error_callback,00); - 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; @@ -218,7 +218,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 -> j2k_dump: failed to setup the decoder\n"); - opj_stream_destroy_v3(l_stream); + opj_stream_destroy(l_stream); opj_destroy_codec(l_codec); return EXIT_FAILURE; } @@ -226,7 +226,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 -> j2k_to_image: 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); return EXIT_FAILURE; @@ -246,7 +246,7 @@ int main(int argc, char **argv) fprintf(stdout, "Decoding tile %d ...\n", tile_index); \ if(!opj_get_decoded_tile(l_codec, l_stream, image, tile_index )){ \ fprintf(stderr, "ERROR -> j2k_to_image: failed to decode tile %d\n", tile_index); \ - opj_stream_destroy_v3(l_stream); \ + opj_stream_destroy(l_stream); \ opj_destroy_cstr_info(&cstr_info); \ opj_destroy_codec(l_codec); \ opj_image_destroy(image); \ @@ -255,7 +255,7 @@ int main(int argc, char **argv) for(index = 0; index < image->numcomps; ++index) { \ if( image->comps[index].data == NULL ){ \ fprintf(stderr, "ERROR -> j2k_to_image: failed to decode tile %d\n", tile_index); \ - opj_stream_destroy_v3(l_stream); \ + opj_stream_destroy(l_stream); \ opj_destroy_cstr_info(&cstr_info); \ opj_destroy_codec(l_codec); \ opj_image_destroy(image); \ @@ -272,7 +272,7 @@ int main(int argc, char **argv) TEST_TILE(tile_lr) /* Close the byte stream */ - opj_stream_destroy_v3(l_stream); + opj_stream_destroy(l_stream); /* Destroy code stream info */ opj_destroy_cstr_info(&cstr_info); |