2005-01-12 Jean-Pierre Roux <jpr@creatis.univ-lyon1.fr>

[gdcm.git] / src / gdcmPixelReadConvert.cxx

diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx
index b1d7335a1f07110970c52999aafe3e94a18340eb..9ef62cd05b34fabe0e113d1bc2cfb20b400757ad 100644 (file)
--- 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/07 22:03:30 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2005/01/12 15:22:23 $
+  Version:   $Revision: 1.25 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -24,6 +24,8 @@
 
 #include "gdcmDebug.h"
 #include "gdcmHeader.h"
+#include "gdcmGlobal.h"
+#include "gdcmTS.h"
 #include "gdcmPixelReadConvert.h"
 #include "gdcmDocEntry.h"
 #include "gdcmRLEFramesInfo.h"
@@ -167,7 +169,7 @@ void PixelReadConvert::ReadAndDecompress12BitsTo16Bits( std::ifstream *fp )
 
 /**
  * \brief     Try to deal with RLE 16 Bits. 
- *            We assume the RLE has allready been parsed and loaded in
+ *            We assume the RLE has already been parsed and loaded in
  *            Raw (through \ref ReadAndDecompressJPEGFile ).
  *            We here need to make 16 Bits Pixels from Low Byte and
  *            High Byte 'Planes'...(for what it may mean)
@@ -317,11 +319,8 @@ void PixelReadConvert::ConvertSwapZone()
       uint16_t *im16 = (uint16_t*)Raw;
       switch( SwapCode )
       {
-         case 0:
-         case 12:
          case 1234:
             break;
-         case 21:
          case 3412:
          case 2143:
          case 4321:
@@ -342,7 +341,6 @@ void PixelReadConvert::ConvertSwapZone()
       uint32_t* im32 = (uint32_t*)Raw;
       switch ( SwapCode )
       {
-         case 0:
          case 1234:
             break;
          case 4321:
@@ -452,13 +450,12 @@ bool PixelReadConvert::ReadAndDecompressJPEGFramesFromFile( std::ifstream *fp )
          {
             return false;
          }
-         //assert( IsJPEGLossless );
+         //gdcmAssertMacro( IsJPEGLossless );
       }
       else
       {
          // other JPEG lossy not supported
-         gdcmErrorMacro("PixelReadConvert::ReadAndDecompressJPEGFile: unknown "
-                   "jpeg lossy compression ");
+         gdcmErrorMacro( "Unknown jpeg lossy compression ");
          return false;
       }
 
@@ -517,9 +514,7 @@ ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp )
       if ( ! gdcm_read_JPEG_memory8( buffer, totalLength, Raw,
                                      &howManyRead, &howManyWritten ) ) 
       {
-         gdcmErrorMacro(
-            "PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg8 "
-            );
+         gdcmErrorMacro( "Failed to read jpeg8 ");
          delete [] buffer;
          return false;
       }
@@ -529,9 +524,7 @@ ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp )
       if ( ! gdcm_read_JPEG_memory12( buffer, totalLength, Raw,
                                       &howManyRead, &howManyWritten ) ) 
       {
-         gdcmErrorMacro(
-            "PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg12 "
-            );
+         gdcmErrorMacro( "Failed to read jpeg12 ");
             delete [] buffer;
             return false;
       }
@@ -542,9 +535,7 @@ ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp )
       if ( ! gdcm_read_JPEG_memory16( buffer, totalLength, Raw,
                                       &howManyRead, &howManyWritten ) ) 
       {
-         gdcmErrorMacro(
-            "PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg16 "
-            );
+         gdcmErrorMacro( "Failed to read jpeg16 ");
          delete [] buffer;
          return false;
       }
@@ -552,8 +543,7 @@ ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp )
    else
    {
       // other JPEG lossy not supported
-      gdcmErrorMacro("PixelConvert::ReadAndDecompressJPEGFile: unknown "
-                "jpeg lossy compression ");
+      gdcmErrorMacro( "Unknown jpeg lossy compression ");
       delete [] buffer;
       return false;
    }      
@@ -619,7 +609,7 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp )
                                      Raw+howManyWritten,
                                      &howManyRead, &howManyWritten ) ) 
           {
-            gdcmErrorMacro("PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg8 ");
+            gdcmErrorMacro( "Failed to read jpeg8");
             delete [] buffer;
             return false;
           }
@@ -631,7 +621,7 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp )
                                       Raw+howManyWritten,
                                       &howManyRead, &howManyWritten ) ) 
           {
-            gdcmErrorMacro("PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg12 ");
+            gdcmErrorMacro( "Failed to read jpeg12");
             delete [] buffer;
             return false;
          }
@@ -643,7 +633,7 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp )
                                       Raw+howManyWritten,
                                       &howManyRead, &howManyWritten ) ) 
           {
-            gdcmErrorMacro("PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg16 ");
+            gdcmErrorMacro( "Failed to read jpeg16 ");
             delete [] buffer;
             return false;
           }
@@ -651,8 +641,7 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp )
       else
       {
          // other JPEG lossy not supported
-         gdcmErrorMacro("PixelConvert::ReadAndDecompressJPEGFile: unknown "
-                   "jpeg lossy compression ");
+         gdcmErrorMacro( "Unknown jpeg lossy compression ");
          delete [] buffer;
          return false;
       }
@@ -1044,17 +1033,17 @@ void PixelReadConvert::GrabInformationsFromHeader( Header *header )
    PixelSize = header->GetPixelSize();
    PixelSign = header->IsSignedPixelData();
    SwapCode  = header->GetSwapCode();
-   TransferSyntaxType ts = header->GetTransferSyntax();
+   std::string ts = header->GetTransferSyntax();
    IsRaw =
         ( ! header->IsDicomV3() )
-     || ts == ImplicitVRLittleEndian
-     || ts == ImplicitVRLittleEndianDLXGE
-     || ts == ExplicitVRLittleEndian
-     || ts == ExplicitVRBigEndian
-     || ts == DeflatedExplicitVRLittleEndian;
-   IsJPEG2000     = header->IsJPEG2000();
-   IsJPEGLossless = header->IsJPEGLossless();
-   IsRLELossless  =  ( ts == RLELossless );
+     || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndian
+     || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndianDLXGE
+     || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRLittleEndian
+     || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRBigEndian
+     || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::DeflatedExplicitVRLittleEndian;
+   IsJPEG2000     = Global::GetTS()->IsJPEG2000(ts);
+   IsJPEGLossless = Global::GetTS()->IsJPEGLossless(ts);
+   IsRLELossless  =  Global::GetTS()->IsRLELossless(ts);
    PixelOffset     = header->GetPixelOffset();
    PixelDataLength = header->GetPixelAreaLength();
    RLEInfo  = header->GetRLEInfo();
@@ -1071,9 +1060,9 @@ void PixelReadConvert::GrabInformationsFromHeader( Header *header )
    if ( HasLUT )
    {
       // Just in case some access to a Header element requires disk access.
-      LutRedDescriptor   = header->GetEntryByNumber( 0x0028, 0x1101 );
-      LutGreenDescriptor = header->GetEntryByNumber( 0x0028, 0x1102 );
-      LutBlueDescriptor  = header->GetEntryByNumber( 0x0028, 0x1103 );
+      LutRedDescriptor   = header->GetEntry( 0x0028, 0x1101 );
+      LutGreenDescriptor = header->GetEntry( 0x0028, 0x1102 );
+      LutBlueDescriptor  = header->GetEntry( 0x0028, 0x1103 );
    
       // Depending on the value of Document::MAX_SIZE_LOAD_ELEMENT_VALUE
       // [ refer to invocation of Document::SetMaxSizeLoadEntry() in
@@ -1091,7 +1080,7 @@ void PixelReadConvert::GrabInformationsFromHeader( Header *header )
    
       ////// Red round
       header->LoadEntryBinArea(0x0028, 0x1201);
-      LutRedData = (uint8_t*)header->GetEntryBinAreaByNumber( 0x0028, 0x1201 );
+      LutRedData = (uint8_t*)header->GetEntryBinArea( 0x0028, 0x1201 );
       if ( ! LutRedData )
       {
          gdcmVerboseMacro( "Unable to read red LUT data" );
@@ -1099,7 +1088,7 @@ void PixelReadConvert::GrabInformationsFromHeader( Header *header )
 
       ////// Green round:
       header->LoadEntryBinArea(0x0028, 0x1202);
-      LutGreenData = (uint8_t*)header->GetEntryBinAreaByNumber(0x0028, 0x1202 );
+      LutGreenData = (uint8_t*)header->GetEntryBinArea(0x0028, 0x1202 );
       if ( ! LutGreenData)
       {
          gdcmVerboseMacro( "Unable to read green LUT data" );
@@ -1107,7 +1096,7 @@ void PixelReadConvert::GrabInformationsFromHeader( Header *header )
 
       ////// Blue round:
       header->LoadEntryBinArea(0x0028, 0x1203);
-      LutBlueData = (uint8_t*)header->GetEntryBinAreaByNumber( 0x0028, 0x1203 );
+      LutBlueData = (uint8_t*)header->GetEntryBinArea( 0x0028, 0x1203 );
       if ( ! LutBlueData )
       {
          gdcmVerboseMacro( "Unable to read blue LUT data" );