diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-30 15:43:09 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-30 15:43:09 +0000 |
| commit | b103fec939c0983d3c20fcb8a7b7866075131bf7 (patch) | |
| tree | 6eb421f15bc5686a7117cc92f58471626e22c04a | |
| parent | 728be68bfe552f32cffc02e452544585dc2aed8e (diff) | |
[trunk] COMP: _v2 code remove (thanks to Hans Johnson and Winfried)
| -rw-r--r-- | applications/jpip/libopenjpip/jp2k_decoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/applications/jpip/libopenjpip/jp2k_decoder.c b/applications/jpip/libopenjpip/jp2k_decoder.c index d20dd8cf..9d619b09 100644 --- a/applications/jpip/libopenjpip/jp2k_decoder.c +++ b/applications/jpip/libopenjpip/jp2k_decoder.c @@ -68,7 +68,7 @@ Byte_t * j2k_to_pnm( FILE *fp, ihdrbox_param_t **ihdrbox) /* JPEG-2000 codestream */ /* get a decoder handle */ - l_codec = opj_create_decompress_v2(CODEC_J2K); + l_codec = opj_create_decompress(CODEC_J2K); /* catch events using our callbacks and give a local context */ opj_set_info_handler(l_codec, info_callback,00); @@ -76,7 +76,7 @@ Byte_t * j2k_to_pnm( FILE *fp, ihdrbox_param_t **ihdrbox) 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"); return NULL; } @@ -101,7 +101,7 @@ Byte_t * j2k_to_pnm( FILE *fp, ihdrbox_param_t **ihdrbox) #endif /*TODO*/ /* Get the decoded image */ - if ( !( opj_decode_v2(l_codec, l_stream, image) && opj_end_decompress(l_codec,l_stream) ) ) { + if ( !( opj_decode(l_codec, l_stream, image) && opj_end_decompress(l_codec,l_stream) ) ) { fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n"); opj_stream_destroy(l_stream); opj_destroy_codec(l_codec); |