*FIX : gdcmHeader::LoadElements is now based

[gdcm.git] / src / gdcmFile.cxx

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 1a57bb6d74116bd34dad2a44e8c51b4217587f4c..4b22d148d7ec4823f52bdf2e5f1ae1fbc130241a 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -374,7 +374,7 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
    unsigned char * a       = (unsigned char *)destination;      
    unsigned char * lutRGBA = (unsigned char *)GetLUTRGBA();
    if (lutRGBA) {          
-      int l = lgrTotale/3;
+      int l = lgrTotaleRaw;
       memmove(newDest, destination, l);// move Gray pixels to temp area            
       int j;    
       for (int i=0;i<l; i++) {         // Build RGB Pixels
@@ -416,8 +416,7 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
                   
    }   
         
-        // TODO : Drop Palette Color out of the Header? 
-            
+   // TODO : Drop Palette Color out of the Header?          
    return lgrTotale; 
 }
 
@@ -579,10 +578,15 @@ size_t gdcmFile::GetImageDataIntoVectorRaw (void* destination, size_t MaxSize) {
          if (str_PhotometricInterpretation == "YBR_FULL") { 
         
         // Warning : YBR_FULL_422 acts as RGB
-         //       need to make RGB Pixels from Planes Y,cB,cR
+         //         : we need to make RGB Pixels from Planes Y,cB,cR
          // see http://lestourtereaux.free.fr/papers/data/yuvrgb.pdf
          // for code optimisation
-
+        
+        // to see the tricks about YBR_FULL, YBR_FULL_422, 
+         // YBR_PARTIAL_422, YBR_ICT, YBR_RCT have a look at :
+        //   ftp://medical.nema.org/medical/dicom/final/sup61_ft.pdf
+        // and be *very* affraid
+        //
             int l = GetXSize()*GetYSize();
             int nbFrames = GetZSize();