walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] COMP: _v2 code remove (thanks to Hans Johnson and Winfried)

This commit is contained in:
Mickael Savinaud 2012-08-30 15:43:09 +00:00
parent 728be68bfe
commit b103fec939
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
applications/jpip/libopenjpip/jp2k_decoder.c
View File

@ -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, &parameters) ){
if ( !opj_setup_decoder(l_codec, &parameters) ){
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);