COMP: Make bcc55 happy

[gdcm.git] / src / gdcmJpeg2000.cxx

diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx
index 691fc38c542c5ca6322de263bca47a565ef11b35..df21cc199cd7349c402536d50f16e057dcae8cff 100644 (file)
--- 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:25:23 $
-  Version:   $Revision: 1.35 $
+  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
@@ -93,15 +93,24 @@ bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength)
 
   /* set decoding parameters to default values */
   opj_set_default_decoder_parameters(&parameters);
+ 
+   // default blindly copied
+   parameters.cp_layer=0;
+   parameters.cp_reduce=0;
+//   parameters.decod_format=-1;
+//   parameters.cod_format=-1;
 
       /* JPEG-2000 codestream */
+    parameters.decod_format = J2K_CFMT;
     assert(parameters.decod_format == J2K_CFMT);
+  parameters.cod_format = PGX_DFMT;
+  assert(parameters.cod_format == PGX_DFMT);
 
       /* get a decoder handle */
       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, &parameters);
@@ -112,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;
@@ -125,6 +133,7 @@ bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength)
   delete[] src;  //FIXME
   src = NULL;
 
+
    // Copy buffer
    for (int compno = 0; compno < image->numcomps; compno++)
    {
@@ -174,7 +183,8 @@ bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength)
 
   /* free image data structure */
   opj_image_destroy(image);
-   return true;
+
+  return true;
 }
 
 #if 0