X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg2000.cxx;h=df21cc199cd7349c402536d50f16e057dcae8cff;hb=a98b52385287bd4c6855758bdaa1d1ce2b7333be;hp=6d8791e28953ca6ac4fddbc3bdab8bc4a8d379d8;hpb=0c89523c005b3d8fd3de1cdf5afba4cc3c6c7bf9;p=gdcm.git diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx index 6d8791e2..df21cc19 100644 --- a/src/gdcmJpeg2000.cxx +++ b/src/gdcmJpeg2000.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmJpeg2000.cxx,v $ Language: C++ - Date: $Date: 2006/01/24 20:38:43 $ - Version: $Revision: 1.36 $ + Date: $Date: 2006/01/24 20:48:10 $ + Version: $Revision: 1.38 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -110,7 +110,7 @@ bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength) dinfo = opj_create_decompress(CODEC_J2K); /* catch events using our callbacks and give a local context */ - opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, stderr); + opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, NULL); /* setup the decoder decoding parameters using user parameters */ opj_setup_decoder(dinfo, ¶meters); @@ -121,7 +121,6 @@ bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength) /* decode the stream and fill the image structure */ image = opj_decode(dinfo, cio); if(!image) { - fprintf(stderr, "ERROR -> j2k_to_image: failed to decode image!\n"); opj_destroy_decompress(dinfo); opj_cio_close(cio); return 1; @@ -131,8 +130,8 @@ bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength) opj_cio_close(cio); /* free the memory containing the code-stream */ - //delete[] src; //FIXME - //src = NULL; + delete[] src; //FIXME + src = NULL; // Copy buffer