X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.cxx;h=264f30bc7343543efd45a93140b556eb6f4dc4e0;hb=d6883344e7e961e20b0e9c83a3ef861313cfc948;hp=7eb18f35bc6b17392d29d92090a5329ec873dafb;hpb=f404ce652df065234b0e8223f26d388c5a7e9af5;p=gdcm.git

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index 7eb18f35..264f30bc 100644
--- a/src/gdcmPixelReadConvert.cxx
+++ b/src/gdcmPixelReadConvert.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmPixelReadConvert.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/06/14 13:56:41 $
-  Version:   $Revision: 1.65 $
+  Date:      $Date: 2005/06/17 12:35:00 $
+  Version:   $Revision: 1.67 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -259,7 +259,7 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp )
    {
       //gdcmWarningMacro( "Sorry, MPEG not yet taken into account" );
       //return false;
-//      ReadMPEGFile(fp, Raw, PixelDataLength); // fp has already been seek to start of mpeg
+      //ReadMPEGFile(fp, Raw, PixelDataLength); // fp has already been seek to start of mpeg
       return true;
    }
    else
@@ -416,6 +416,8 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp )
 {
    if ( IsJPEG2000 )
    {
+     // make sure this is the right JPEG compression
+     assert( !IsJPEGLossless || !IsJPEGLossy || !IsJPEGLS );
      // FIXME this is really ugly but it seems I have to load the complete
      // jpeg2000 stream to use jasper:
       // I don't think we'll ever be able to deal with multiple fragments properly
@@ -444,10 +446,13 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp )
       {
          return true;
       }
+      // wow what happen, must be an error
+      return false;
    }
-
-   if ( IsJPEGLS )
+   else if ( IsJPEGLS )
    {
+     // make sure this is the right JPEG compression
+     assert( !IsJPEGLossless || !IsJPEGLossy || !IsJPEG2000 );
    // WARNING : JPEG-LS is NOT the 'classical' Jpeg Lossless : 
    // [JPEG-LS is the basis for new lossless/near-lossless compression
    // standard for continuous-tone images intended for JPEG2000. The standard
@@ -456,6 +461,34 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp )
    //
    // see http://datacompression.info/JPEGLS.shtml
    //
+#if 0
+   std::cerr << "count:" << JPEGInfo->GetFragmentCount() << std::endl;
+      unsigned long inputlength = 0;
+      JPEGFragment *jpegfrag = JPEGInfo->GetFirstFragment();
+      while( jpegfrag )
+      {
+         inputlength += jpegfrag->GetLength();
+         jpegfrag = JPEGInfo->GetNextFragment();
+      }
+      gdcmAssertMacro( inputlength != 0);
+      uint8_t *inputdata = new uint8_t[inputlength];
+      char *pinputdata = (char*)inputdata;
+      jpegfrag = JPEGInfo->GetFirstFragment();
+      while( jpegfrag )
+      {
+         fp->seekg( jpegfrag->GetOffset(), std::ios::beg);
+         fp->read(pinputdata, jpegfrag->GetLength());
+         pinputdata += jpegfrag->GetLength();
+         jpegfrag = JPEGInfo->GetNextFragment();
+      }  
+      
+  //fp->read((char*)Raw, PixelDataLength);
+
+  std::ofstream out("/tmp/jpegls.jpg");
+  out.write((char*)inputdata, inputlength);
+  out.close();
+  delete[] inputdata;
+#endif
 
       gdcmWarningMacro( "Sorry, JPEG-LS not yet taken into account" );
       fp->seekg( JPEGInfo->GetFirstFragment()->GetOffset(), std::ios::beg);
@@ -463,14 +496,16 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp )
          return false;
    }
    else
-     {
+   {
+     // make sure this is the right JPEG compression
+     assert( !IsJPEGLS || !IsJPEG2000 );
      // Precompute the offset localRaw will be shifted with
      int length = XSize * YSize * SamplesPerPixel;
      int numberBytes = BitsAllocated / 8;
 
      JPEGInfo->DecompressFromFile(fp, Raw, BitsStored, numberBytes, length );
      return true;
-     }
+   }
 }
 
 /**
@@ -577,7 +612,8 @@ void PixelReadConvert::BuildLUTRGBA()
       LutRGBA = new uint8_t[ 1024 ]; // 256 * 4 (R, G, B, Alpha)
       if ( !LutRGBA )
          return;
-
+      LutItemNumber = 256;
+      LutItemSize   = 8;
       memset( LutRGBA, 0, 1024 );
                                                                                 
       int mult;
@@ -648,6 +684,9 @@ void PixelReadConvert::BuildLUTRGBA()
          return;
       memset( LutRGBA, 0, 65536*4*2 );  // 16 bits = 2 bytes ;-)
 
+      LutItemNumber = 65536;
+      LutItemSize   = 16;
+
       int i;
       uint16_t *a16;
 
@@ -656,21 +695,21 @@ void PixelReadConvert::BuildLUTRGBA()
       a16 = (uint16_t*)LutRGBA + 0 + debR;
       for( i=0; i < lengthR; ++i )
       {
-         *a16 = ((uint16_t*)LutRedData)[i+1];
+         *a16 = ((uint16_t*)LutRedData)[i];
          a16 += 4;
       }
                                                                               
       a16 = (uint16_t*)LutRGBA + 1 + debG;
       for( i=0; i < lengthG; ++i)
       {
-         *a16 = ((uint16_t*)LutGreenData)[i+1];
+         *a16 = ((uint16_t*)LutGreenData)[i];
          a16 += 4;
       }
                                                                                 
       a16 = (uint16_t*)LutRGBA + 2 + debB;
       for(i=0; i < lengthB; ++i)
       {
-         *a16 = ((uint16_t*)LutBlueData)[i+1];
+         *a16 = ((uint16_t*)LutBlueData)[i];
          a16 += 4;
       }
                                                                              
@@ -933,6 +972,15 @@ void PixelReadConvert::ConvertRGBPlanesToRGBPixels()
  */
 void PixelReadConvert::ConvertYcBcRPlanesToRGBPixels()
 {
+  // Remarks for YBR newbees :
+  // YBR_FULL works very much like RGB, i.e. three samples per pixel, 
+  // just the color space is YCbCr instead of RGB. This is particularly useful
+  // for doppler ultrasound where most of the image is grayscale 
+  // (i.e. only populates the Y components) and Cb and Cr are mostly zero,
+  // except for the few patches of color on the image. //
+  // On such images, RLE achieves a compression ratio that is much better 
+  // than the compression ratio on an equivalent RGB image. 
+    
    uint8_t *localRaw = Raw;
    uint8_t *copyRaw = new uint8_t[ RawSize ];
    memmove( copyRaw, localRaw, RawSize );