X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg2000.cxx;h=079e58a96b8af6bea1beb68e1fea8b43d9efc12f;hb=34e322ceb4e12797e6d4cb1e691a36425015d2e0;hp=74b41960fdbacdcaae5fd392ef6b3ec892433a61;hpb=9e530ca0f284e366fad141be7fdf086f482b0d6e;p=gdcm.git

diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx
index 74b41960..079e58a9 100644
--- a/src/gdcmJpeg2000.cxx
+++ b/src/gdcmJpeg2000.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmJpeg2000.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/02 12:37:21 $
-  Version:   $Revision: 1.22 $
+  Date:      $Date: 2005/07/11 18:10:29 $
+  Version:   $Revision: 1.27 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -35,6 +35,12 @@ namespace gdcm
 
 bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength)
 {
+#if 0
+  std::cerr << "Inputlenght=" << inputlength << std::endl;
+  std::ofstream out("/tmp/jpeg2000.jpc", std::ios::binary);
+  out.write((char*)inputdata,inputlength);
+  out.close();
+#endif
   jas_init(); //important...
   jas_stream_t *jasStream = 
     jas_stream_memopen((char *)inputdata, inputlength);
@@ -61,10 +67,8 @@ bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength)
   int height = jas_image_cmptheight(jasImage, 0);
   int prec = jas_image_cmptprec(jasImage, 0);
   int i, j, k;
-  char *fmtname = jas_image_fmttostr(fmtid);
-  printf("%s %d %d %d %d %ld\n", fmtname, numcmpts, width, height, prec, (long) jas_image_rawsize(jasImage));
 
-  // The following should serioulsy be rewritten I cannot belive we need to
+  // The following should serioulsy be rewritten I cannot believe we need to
   // do a per pixel decompression, there should be a way to read a full
   // scanline...
   if (prec == 8)
@@ -97,6 +101,11 @@ bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength)
 
   //FIXME
   //delete the jpeg temp buffer
+#if 0
+  std::ofstream rawout("/tmp/jpeg2000.raw");
+  rawout.write((char*)raw,height*width*numcmpts*((prec+4)/8));
+  rawout.close();
+#endif
   delete[] inputdata;
 
   return true;