X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmJpeg2000.cxx;h=0064240c19a0fcaeeca7e18fe3a38cb5e4dc3b8a;hb=e362e154b84f087750d1ed1f6671a34b3bf5ff7a;hp=079e58a96b8af6bea1beb68e1fea8b43d9efc12f;hpb=48945a57c73e99f36067905b226bd58fe1204ff0;p=gdcm.git

diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx
index 079e58a9..0064240c 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/07/11 18:10:29 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2005/11/04 15:20:13 $
+  Version:   $Revision: 1.33 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,7 +20,10 @@
 
 #include <iostream>
 #include <fstream>
-#include <jasper/jasper.h>
+
+extern "C" {
+  #include <openjpeg.h>
+}
 
 namespace gdcm 
 {
@@ -34,6 +37,79 @@ namespace gdcm
  */
 
 bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength)
+{
+   j2k_image_t img;
+   j2k_cp_t cp;
+ 
+   // default blindly copied
+   cp.layer=0;
+   cp.reduce=0;
+   cp.decod_format=-1;
+   cp.cod_format=-1;
+ 
+   cp.cod_format=J2K_CFMT;
+   cp.decod_format = PGX_DFMT;
+   int len = inputlength;
+   unsigned char *src = (unsigned char*)inputdata;
+ 
+   // Decompression
+   if (!j2k_decode(src, len, &img, &cp))
+   {
+      gdcmErrorMacro( "ERROR -> j2k_to_image: failed to decode image!" );
+      return false;
+   }
+ 
+   // Copy buffer
+   for (int compno = 0; compno < img.numcomps; compno++)
+   {
+      j2k_comp_t *comp = &img.comps[compno];
+  
+      int w = img.comps[compno].w;
+      int wr = int_ceildivpow2(img.comps[compno].w, img.comps[compno].factor);
+  
+      //int h = img.comps[compno].h;
+      int hr = int_ceildivpow2(img.comps[compno].h, img.comps[compno].factor);
+  
+      if (comp->prec <= 8)
+      {
+         uint8_t *data8 = (uint8_t*)raw;
+         for (int i = 0; i < wr * hr; i++) 
+         {
+            int v = img.comps[compno].data[i / wr * w + i % wr];
+            *data8++ = (uint8_t)v;
+         }
+      }
+      else if (comp->prec <= 16)
+      {
+         uint16_t *data16 = (uint16_t*)raw;
+         for (int i = 0; i < wr * hr; i++) 
+         {
+            int v = img.comps[compno].data[i / wr * w + i % wr];
+            *data16++ = (uint16_t)v;
+         }
+      }
+      else
+      {
+         uint32_t *data32 = (uint32_t*)raw;
+         for (int i = 0; i < wr * hr; i++) 
+         {
+            int v = img.comps[compno].data[i / wr * w + i % wr];
+            *data32++ = (uint32_t)v;
+         }
+      }
+      free(img.comps[compno].data);
+   }
+ 
+   // Free remaining structures
+   j2k_dec_release();
+   // FIXME
+   delete[] inputdata;
+ 
+   return true;
+}
+
+#if 0
+bool gdcm_read_JASPER_file (void* raw, char *inputdata, size_t inputlength)
 {
 #if 0
   std::cerr << "Inputlenght=" << inputlength << std::endl;
@@ -53,7 +129,7 @@ bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength)
     }
 
   // Decode the image. 
-  jas_image_t *jasImage = NULL;
+  jas_image_t *jasImage /* = NULL*/; // Useless assignation
   if (!(jasImage = jas_image_decode(jasStream, fmtid, 0))) 
     {
     gdcmErrorMacro("cannot decode image");
@@ -110,6 +186,7 @@ bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength)
 
   return true;
 }
+#endif
 
 //-----------------------------------------------------------------------------
 } // end namespace gdcm