X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.cxx;h=b94a76a82cb57149e26450a1673bafd2d0dd37bb;hb=ab3dc69a71af640fa49cbd917272d9ff7d1651b6;hp=eae74e04799277147aa3d9ebbdefbb46a32fefb8;hpb=70a3a0f95bf2240a6ef4b1d6523c0e6614437304;p=gdcm.git

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index eae74e04..b94a76a8 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/01/24 14:52:50 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2005/01/26 11:42:02 $
+  Version:   $Revision: 1.35 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -257,11 +257,11 @@ bool PixelReadConvert::ReadAndDecompressRLEFile( std::ifstream *fp )
       ++it )
    {
       // Loop on the fragments
-      for( unsigned int k = 1; k <= (*it)->NumberFragments; k++ )
+      for( unsigned int k = 1; k <= (*it)->GetNumberOfFragments(); k++ )
       {
-         fp->seekg(  (*it)->Offset[k] , std::ios::beg );
+         fp->seekg(  (*it)->GetOffset(k) , std::ios::beg );
          (void)ReadAndDecompressRLEFragment( subRaw,
-                                             (*it)->Length[k],
+                                             (*it)->GetLength(k),
                                              RawSegmentSize, 
                                              fp );
          subRaw += RawSegmentSize;
@@ -471,7 +471,7 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp )
         (it != JPEGInfo->Fragments.end()) && (howManyRead < totalLength);
         ++it )
    {
-      fragmentLength += (*it)->Length;
+      fragmentLength += (*it)->GetLength();
       
       if (howManyRead > fragmentLength) continue;
       
@@ -497,11 +497,31 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp )
 {
    if ( IsJPEG2000 )
    {
-      fp->seekg( (*JPEGInfo->Fragments.begin())->Offset, std::ios::beg);
-//      if ( ! gdcm_read_JPEG2000_file( fp,Raw ) )
+      gdcmVerboseMacro( "Sorry, JPEG2000 not yet taken into account" );
+      fp->seekg( (*JPEGInfo->Fragments.begin())->GetOffset(), std::ios::beg);
+//    if ( ! gdcm_read_JPEG2000_file( fp,Raw ) )
+          gdcmVerboseMacro( "Wrong Blue LUT descriptor" );
+          return false;
+   }
+
+   if ( IsJPEGLS )
+   {
+      gdcmVerboseMacro( "Sorry, JPEG-LS not yet taken into account" );
+      fp->seekg( (*JPEGInfo->Fragments.begin())->GetOffset(), std::ios::beg);
+//    if ( ! gdcm_read_JPEGLS_file( fp,Raw ) )
          return false;
    }
 
+   if ( ( ZSize == 1 ) && ( JPEGInfo->Fragments.size() > 1 ) )
+   {
+      // we have one frame split into several fragments
+      // we will pack those fragments into a single buffer and 
+      // read from it
+      return ReadAndDecompressJPEGSingleFrameFragmentsFromFile( fp );
+   }
+   else if (JPEGInfo->Fragments.size() == (size_t)ZSize)
+   {
+   }
 //   if ( ( ZSize == 1 ) && ( JPEGInfo->Fragments.size() > 1 ) )
 //   {
 //      // we have one frame split into several fragments
@@ -895,9 +915,9 @@ void PixelReadConvert::GrabInformationsFromHeader( File *header )
    if ( HasLUT )
    {
       // Just in case some access to a File element requires disk access.
-      LutRedDescriptor   = header->GetEntry( 0x0028, 0x1101 );
-      LutGreenDescriptor = header->GetEntry( 0x0028, 0x1102 );
-      LutBlueDescriptor  = header->GetEntry( 0x0028, 0x1103 );
+      LutRedDescriptor   = header->GetEntryValue( 0x0028, 0x1101 );
+      LutGreenDescriptor = header->GetEntryValue( 0x0028, 0x1102 );
+      LutBlueDescriptor  = header->GetEntryValue( 0x0028, 0x1103 );
    
       // Depending on the value of Document::MAX_SIZE_LOAD_ELEMENT_VALUE
       // [ refer to invocation of Document::SetMaxSizeLoadEntry() in