X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFile.cxx;h=88dcdf6a04a02a7ac6ad7fac2db59db677c6674a;hb=a18a9f20d96301e1c91be637415599e5fdc1ca43;hp=ddde9fe44edd128eaf2c2157508876e15d136801;hpb=eb941e8785d3742b8a6a1aac964d43dcb4cf49f0;p=gdcm.git

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index ddde9fe4..88dcdf6a 100644
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -1,23 +1,8 @@
 // gdcmFile.cxx
 
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'type' : forcing value to bool 'true' or 'false' (performance warning)
-//#pragma warning ( disable : 4800 )
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
-
 #include "gdcmFile.h"
 #include "gdcmUtil.h"
 #include "iddcmjpeg.h" // for the 'LibIDO' Jpeg LossLess
-using namespace std;
-
-#define str2num(str, typeNum) *((typeNum *)(str))
 
 /////////////////////////////////////////////////////////////////
 /**
@@ -37,7 +22,7 @@ using namespace std;
  * @return	
  */
  
-gdcmFile::gdcmFile(string & filename) 
+gdcmFile::gdcmFile(std::string & filename) 
 	:gdcmHeader(filename.c_str())	
 {
    SetPixelDataSizeFromHeader();
@@ -54,35 +39,60 @@ gdcmFile::gdcmFile(const char * filename)
  * \brief     calcule la longueur (in bytes) A ALLOUER pour recevoir les
  *        	pixels de l'image
  *  		ou DES images dans le cas d'un multiframe
- *  		ATTENTION : il ne s'agit PAS de la longueur du groupe des Pixels	
+ *  		ATTENTION : il ne s'agit PAS de la longueur du groupe des Pixels
  *  		(dans le cas d'images compressees, elle n'a pas de sens).
  *
  * @return	longueur a allouer 
  */
 void gdcmFile::SetPixelDataSizeFromHeader(void) {
    int nb;
-   string str_nb;
+   std::string str_nb;
 
    str_nb=gdcmHeader::GetPubElValByNumber(0x0028,0x0100);
-   if (str_nb == "gdcm::Unfound" ) {
+   if (str_nb == GDCM_UNFOUND ) {
       nb = 16;
    } else {
       nb = atoi(str_nb.c_str() );
       if (nb == 12) nb =16;
    }
    lgrTotale =  GetXSize() *  GetYSize() *  GetZSize() * (nb/8)* GetSamplesPerPixel();
-   
-   string str_PhotometricInterpretation = gdcmHeader::GetPubElValByNumber(0x0028,0x0004);
-   if (   str_PhotometricInterpretation == "PALETTE COLOR " 
-       || str_PhotometricInterpretation == "YBR_FULL") {   // --> some more to be added !!
+   std::string str_PhotometricInterpretation = gdcmHeader::GetPubElValByNumber(0x0028,0x0004);
+   if ( str_PhotometricInterpretation == "PALETTE COLOR " ) { 
       lgrTotale*=3;
    }
-   
-   // remaining to check :
-   //   str_PhotometricInterpretation == "YBR_FULL"
-   //   str_PhotometricInterpretation == "YBR_FULL_422" (no LUT, no Palette)
-   // -->and some more !!
 }
+   // see PS 3.3-2003 : C.7.6.3.2.1  
+   // 
+   //   MONOCHROME1
+   //   MONOCHROME2
+   //   PALETTE COLOR
+   //   RGB
+   //   HSV  (Retired)
+   //   ARGB (Retired)
+   //   CMYK (Retired)
+   //   YBR_FULL
+   //   YBR_FULL_422 (no LUT, no Palette)
+   //   YBR_PARTIAL_422
+   //   YBR_ICT
+   //   YBR_RCT
+
+  // LUT's
+  // ex : gdcm-US-ALOKA-16.dcm
+  // 0028|1221 [OW]   [Segmented Red Palette Color Lookup Table Data]
+  // 0028|1222 [OW]   [Segmented Green Palette Color Lookup Table Data]  
+  // 0028|1223 [OW]   [Segmented Blue Palette Color Lookup Table Data]
+
+  // ex : US-PAL-8-10x-echo.dcm, 8BitsRunLengthColor.dcm
+  // 0028|1201 [OW]   [Red Palette Color Lookup Table Data]
+  // 0028|1202 [OW]   [Green Palette Color Lookup Table Data]
+  // 0028|1203 [OW]   [Blue Palette Color Lookup Table Data]
+
+  // ex  : OT-PAL-8-face.dcm
+  // 0028|1201 [US]   [Red Palette Color Lookup Table Data]
+  // 0028|1202 [US]   [Green Palette Color Lookup Table Data]
+  // 0028|1203 [US]   [Blue Palette Color Lookup Table Data]
+
+
 
 /////////////////////////////////////////////////////////////////
 /**
@@ -91,127 +101,12 @@ void gdcmFile::SetPixelDataSizeFromHeader(void) {
  *            the pixel data represented in this file.
  * @return    The size of pixel data in bytes.
  */
+
 size_t gdcmFile::GetImageDataSize(void) {
    return (lgrTotale);
 }
 
 
-/////////////////////////////////////////////////////////////////
-/**
- * \ingroup gdcmFile
- * \brief   Parse pixel data from disk and *prints* the result
- * \        For multi-fragment Jpeg files checking purpose *only*
- * \        Allows to 'see' if the file *does* conform
- * \       (some of them do not)
- * \        with Dicom Part 3, Annex A (PS 3.5-2003, page 58)
- *
- */
-bool gdcmFile::ParsePixelData(void) {
-   if ( !OpenFile())
-      return false;
-      
-    if ( fseek(fp, GetPixelOffset(), SEEK_SET) == -1 ) {
-      CloseFile();
-      return false;
-   } 
-   
-   if ( !IsDicomV3()                             ||
-        IsImplicitVRLittleEndianTransferSyntax() ||
-        IsExplicitVRLittleEndianTransferSyntax() ||
-        IsExplicitVRBigEndianTransferSyntax()    ||
-        IsDeflatedExplicitVRLittleEndianTransferSyntax() ) { 
-        
-        printf ("gdcmFile::ParsePixelData : non JPEG File\n");
-        return 0;       
-   }        
-
-   int nb;
-   string str_nb=gdcmHeader::GetPubElValByNumber(0x0028,0x0100);
-   if (str_nb == "gdcm::Unfound" ) {
-      nb = 16;
-   } else {
-      nb = atoi(str_nb.c_str() );
-      if (nb == 12) nb =16;
-   }
-   int nBytes= nb/8;
-      
-    //int taille = GetXSize() *  GetYSize() * GetZSize() * GetSamplesPerPixel();
-   int taille = GetXSize() *  GetYSize()  * GetSamplesPerPixel(); 
-         
-   printf ("Checking the Dicom-Jpeg/RLE Pixels\n");
-      
-  // ------------------------------- for Parsing : Position on begining of Jpeg Pixels  
-      guint16 ItemTagGr,ItemTagEl; 
-      int ln;
-      long ftellRes;
-      char * destination = NULL;
-      ftellRes=ftell(fp);
-      fread(&ItemTagGr,2,1,fp);  // Reading (fffe) : Basic Offset Table Item Tag Gr
-      fread(&ItemTagEl,2,1,fp);  // Reading (e000) : Basic Offset Table Item Tag El
-      if(GetSwapCode()) {
-         ItemTagGr=SwapShort(ItemTagGr); 
-         ItemTagEl=SwapShort(ItemTagEl);            
-      }
-      printf ("at %x : ItemTag (should be fffe,e000): %04x,%04x\n",
-                ftellRes,ItemTagGr,ItemTagEl );
-      ftellRes=ftell(fp);
-      fread(&ln,4,1,fp); 
-      if(GetSwapCode()) 
-         ln=SwapLong(ln);    // Basic Offset Table Item Lentgh
-      printf("at %x : Basic Offset Table Item Lentgh (??) %d x(%08x)\n",
-            ftellRes,ln,ln);
-      if (ln != 0) {
-         // What is it used for ??
-         char * BasicOffsetTableItemValue= (char *)malloc(ln+1);
-         fread(BasicOffsetTableItemValue,ln,1,fp); 
-         guint32 a;
-         for (int i=0;i<ln;i+=4){
-            a=str2num(&BasicOffsetTableItemValue[i],guint32);
-            printf("      x(%08x)  %d\n",a,a);
-         }              
-      }
-      
-      ftellRes=ftell(fp);
-      fread(&ItemTagGr,2,1,fp);  // Reading (fffe) : Item Tag Gr
-      fread(&ItemTagEl,2,1,fp);  // Reading (e000) : Item Tag El
-      if(GetSwapCode()) {
-         ItemTagGr=SwapShort(ItemTagGr); 
-         ItemTagEl=SwapShort(ItemTagEl);            
-      }  
-      printf ("at %x : ItemTag (should be fffe,e000 or e0dd): %04x,%04x\n",
-            ftellRes,ItemTagGr,ItemTagEl );
-      
-      while (  ( ItemTagGr == 0xfffe) && (ItemTagEl != 0xe0dd) ) { // Parse fragments
-      
-         ftellRes=ftell(fp);
-         fread(&ln,4,1,fp); 
-         if(GetSwapCode()) 
-            ln=SwapLong(ln);    // length
-         printf("      at %x : fragment length %d x(%08x)\n",
-                ftellRes, ln,ln);
-
-         destination += taille * nBytes; // location in user's memory 
-                
-         printf ("      Destination will be x(%x) = %d \n",
-               destination,destination );
-                        
-         fseek(fp,ln,SEEK_CUR); // skipping (not reading) fragment pixels    
-      
-         ftellRes=ftell(fp);
-         fread(&ItemTagGr,2,1,fp);  // Reading (fffe) : Item Tag Gr
-         fread(&ItemTagEl,2,1,fp);  // Reading (e000) : Item Tag El
-         if(GetSwapCode()) {
-            ItemTagGr=SwapShort(ItemTagGr); 
-            ItemTagEl=SwapShort(ItemTagEl);            
-         }
-         printf ("at %x : ItemTag (should be fffe,e000 or e0dd): %04x,%04x\n",
-               ftellRes,ItemTagGr,ItemTagEl );
-               
-      
-      } 
-   return 1;            
-}
-
 /////////////////////////////////////////////////////////////////
 /**
  * \ingroup gdcmFile
@@ -230,7 +125,7 @@ bool gdcmFile::ReadPixelData(void* destination) {
       return false;
    }     
 
-// ------------------------------- Uncompressed File
+// -------------------------  Uncompressed File
     
    if ( !IsDicomV3()                             ||
         IsImplicitVRLittleEndianTransferSyntax() ||
@@ -248,11 +143,11 @@ bool gdcmFile::ReadPixelData(void* destination) {
       }
    } 
     
- // ----------------------------- JPEG Compressed File .
+ // ------------------------  Compressed File .
        
       int nb;
-      string str_nb=gdcmHeader::GetPubElValByNumber(0x0028,0x0100);
-      if (str_nb == "gdcm::Unfound" ) {
+      std::string str_nb=gdcmHeader::GetPubElValByNumber(0x0028,0x0100);
+      if (str_nb == GDCM_UNFOUND ) {
          nb = 16;
       } else {
          nb = atoi(str_nb.c_str() );
@@ -260,7 +155,6 @@ bool gdcmFile::ReadPixelData(void* destination) {
       }
       int nBytes= nb/8;
       
-       //int taille = GetXSize() *  GetYSize() * GetZSize() * GetSamplesPerPixel();
       int taille = GetXSize() *  GetYSize()  * GetSamplesPerPixel(); 
           
                 
@@ -308,17 +202,19 @@ bool gdcmFile::ReadPixelData(void* destination) {
      }
       _IdDcmJpegFree (jpg);
       return true;
-   }  
+   } 
  
+  // ------------------------------- RLE
+
+      if (gdcmHeader::IsRLELossLessTransferSyntax()) {
+            int res = (bool)gdcm_read_RLE_file (destination);
+            return res; 
+      }
+
   // ------------------------------- JPEG Lossy : call to IJG 6b
     
       long fragmentBegining; // for ftell, fseek
-      
-      bool a=0, b=0;
-      
-      a = gdcmHeader::IsRLELossLessTransferSyntax();
-      if (!a)
-         bool b = gdcmHeader::IsJPEG2000();
+      bool b = gdcmHeader::IsJPEG2000();
        
       bool res;
       guint16 ItemTagGr,ItemTagEl;
@@ -359,15 +255,15 @@ bool gdcmFile::ReadPixelData(void* destination) {
          // FIXME : multi fragments 
          fragmentBegining=ftell(fp);
                        
-         if (a)  
-            res = (bool)gdcm_read_RLE_file (destination);       // Reading Fragment pixels 
-         else if (b)
+ 
+         if (b)
             res = (bool)gdcm_read_JPEG2000_file (destination);  // Reading Fragment pixels 
             
-         else if (IsJPEGLossless()) {  // ------------- call to LibIDO Jpeg for each Frame/fragment
+         else if (IsJPEGLossless()) {  
+                  // ------------- call to LibIDO Jpeg for each Frame/fragment
                   
-                                       // Warning : Works only if there is one fragment per frame
-                                       //           (Or a single fragment for the multiframe file)
+                  // Warning : Works only if there is one fragment per frame
+                  //           (Or a single fragment for the multiframe file)
             ClbJpeg* jpg = _IdDcmJpegRead(fp); // TODO : find a 'full' one.
                                                // (We use the LibIDO one :-(
             if(jpg == NULL) {
@@ -424,7 +320,7 @@ bool gdcmFile::ReadPixelData(void* destination) {
          } 
          
       //(char *) destination += taille * nBytes;
-      //cout << "destination" << destination << "\n";
+      //std::cout << "destination" << destination << std::endl;
       }
                 
       return res;
@@ -460,7 +356,7 @@ void * gdcmFile::GetImageData (void) {
 size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
 
    int nb, nbu, highBit, signe;
-   string str_nbFrames, str_nb, str_nbu, str_highBit, str_signe;
+   std::string str_nbFrames, str_nb, str_nbu, str_highBit, str_signe;
  
    if ( lgrTotale > MaxSize ) {
       dbg.Verbose(0, "gdcmFile::GetImageDataIntoVector: pixel data bigger"
@@ -472,7 +368,7 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
 			
 	// Nombre de Bits Alloues pour le stockage d'un Pixel
    str_nb = GetPubElValByNumber(0x0028,0x0100);
-   if (str_nb == "gdcm::Unfound" ) {
+   if (str_nb == GDCM_UNFOUND ) {
       nb = 16;
    } else {
       nb = atoi(str_nb.c_str() );
@@ -480,7 +376,7 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
 	
 	// Nombre de Bits Utilises
    str_nbu=GetPubElValByNumber(0x0028,0x0101);
-   if (str_nbu == "gdcm::Unfound" ) {
+   if (str_nbu == GDCM_UNFOUND ) {
       nbu = nb;
    } else {
       nbu = atoi(str_nbu.c_str() );
@@ -488,7 +384,7 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
 	
 	// Position du Bit de Poids Fort
    str_highBit=GetPubElValByNumber(0x0028,0x0102);
-   if (str_highBit == "gdcm::Unfound" ) {
+   if (str_highBit == GDCM_UNFOUND ) {
       highBit = nb - 1;
    } else {
       highBit = atoi(str_highBit.c_str() );
@@ -496,7 +392,7 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
 		
 	// Signe des Pixels 
    str_signe=GetPubElValByNumber(0x0028,0x0103);
-   if (str_signe == "gdcm::Unfound" ) {
+   if (str_signe == GDCM_UNFOUND ) {
       signe = 1;
    } else {
       signe = atoi(str_signe.c_str() );
@@ -529,94 +425,176 @@ size_t gdcmFile::GetImageDataIntoVector (void* destination, size_t MaxSize) {
          dbg.Verbose(0, "gdcmFile::GetImageDataIntoVector: wierd image");
          return (size_t)0; 
       }
-   }  
-   
-   // Try to deal with the color
-   // --------------------------
-     
-   string str_PhotometricInterpretation = gdcmHeader::GetPubElValByNumber(0x0028,0x0004);
-   
-   if ( (str_PhotometricInterpretation == "MONOCHROME1 ") 
-     || (str_PhotometricInterpretation == "MONOCHROME2 ") 
-     || (str_PhotometricInterpretation == "RGB")) {
-      return lgrTotale; 
-   }
-     
-   switch ( GetPlanarConfiguration() ) {
-   case 0:                              
-      //       Pixels are already RGB
-      break;
+   } 
+
+// Just to 'see' was was actually read on disk :-(
+// Some troubles expected
+
+FILE *  fpSpurious;
+fpSpurious=fopen("SpuriousFile.raw","w"); 
+fwrite(destination,lgrTotale, 1,fpSpurious);
+fclose(fpSpurious);
+
+
+   // *Try* to deal with the color
+   // ----------------------------
+
+   // Planar configuration = 0 : Pixels are already RGB
+   // Planar configuration = 1 : 3 planes : R, G, B
+   // Planar configuration = 2 : 1 gray Plane + 3 LUT
+
+   // Well ... supposed to be !
+   // See US-PAL-8-10x-echo.dcm: PlanarConfiguration=0,PhotometricInterpretation=PALETTE COLOR
+   // and heuristic has to be found :-( 
+
+      std::string str_PhotometricInterpretation = gdcmHeader::GetPubElValByNumber(0x0028,0x0004);
    
-   case 1:
-      //       need to make RGB Pixels from Planes R,G,B
-      {
-         int l = lgrTotale/3 ;
-
-         char * a = (char *)destination;
-         char * b = a + l;
-         char * c = b + l;
-         char * newDest = (char*) malloc(lgrTotale);
-         // TODO :
-         // any trick not to have to allocate temporary buffer is welcome ...
-         char *x = newDest;
-         for (int j=0;j<l; j++) {
-            *(x++) = *(a++);
-            *(x++) = *(b++);
-            *(x++) = *(c++);  
-         }
-         memmove(destination,newDest,lgrTotale);
-         free(newDest);
-         // now, it's an RGB image
-         string spp = "3";
+      if ( (str_PhotometricInterpretation == "MONOCHROME1 ") 
+        || (str_PhotometricInterpretation == "MONOCHROME2 ") 
+        || (str_PhotometricInterpretation == "RGB")) {
+         return lgrTotale; 
+      }
+      int planConf=GetPlanarConfiguration();
+ 
+      switch (planConf) {
+      case 0:                              
+         //       Pixels are already RGB
+         break;
+    
+      case 1:
+
+         {
+         if (str_PhotometricInterpretation == "YBR_FULL") { // Warning : YBR_FULL_422 acts as RGB (?!)
+
+         //       need to make RGB Pixels from Planes Y,cB,cR
+         // see http://lestourtereaux.free.fr/papers/data/yuvrgb.pdf
+         // for code optimisation
+
+            int l = GetXSize()*GetYSize();
+            int nbFrames = GetZSize();
+
+            unsigned char * newDest = (unsigned char*) malloc(lgrTotale);
+            unsigned char *x  = newDest;
+            unsigned char * a = (unsigned char *)destination;
+            unsigned char * b = a + l;
+            unsigned char * c = b + l;
+
+            double R,G,B;
+
+            // TODO : Replace by the 'well known' 
+            //        integer computation counterpart
+            for (int i=0;i<nbFrames;i++) {
+               for (int j=0;j<l; j++) {
+                  R= 1.164 *( *a-16) + 1.596 *( *c -128) + 0.5;
+                  G= 1.164 *( *a-16) - 0.813 *( *c -128) - 0.392 *(*b -128) + 0.5;
+                  B= 1.164 *( *a-16) + 2.017 *( *b -128) + 0.5;
+
+                  if (R<0.0)   R=0.0;
+                  if (G<0.0)   G=0.0;
+                  if (B<0.0)   B=0.0;
+                  if (R>255.0) R=255.0;
+                  if (G>255.0) G=255.0;
+                  if (B>255.0) B=255.0;
+
+                  *(x++) = (unsigned char)R;
+                  *(x++) = (unsigned char)G;
+                  *(x++) = (unsigned char)B;
+                  a++; b++; c++;  
+               }
+           }
+            memmove(destination,newDest,lgrTotale);
+            free(newDest);
+
+        } else {
+         
+         //       need to make RGB Pixels from Planes R,G,B
+
+            int l = GetXSize()*GetYSize();
+            int nbFrames = GetZSize();
+
+            char * newDest = (char*) malloc(lgrTotale);
+            char *x  = newDest;
+            char * a = (char *)destination;
+            char * b = a + l;
+            char * c = b + l;
+
+               // TODO :
+               // any trick not to have to allocate temporary buffer is welcome ...
+
+            for (int i=0;i<nbFrames;i++) {
+               for (int j=0;j<l; j++) {
+                  *(x++) = *(a++);
+                  *(x++) = *(b++);
+                  *(x++) = *(c++);  
+               }
+            }
+            memmove(destination,newDest,lgrTotale);
+            free(newDest);
+        }
+
+            // now, it's an RGB image
+            // Lets's write it in the Header
+         std::string spp = "3";
          gdcmHeader::SetPubElValByNumber(spp,0x0028,0x0002);
-         string rgb="RGB";
+         std::string rgb="RGB";
          gdcmHeader::SetPubElValByNumber(rgb,0x0028,0x0004);
          break;
-      }
-      
-    case 2:                      
-      //       from Lut R + Lut G + Lut B
+       }
+     
+       case 2:                      
+         //       from Lut R + Lut G + Lut B
        
-      // we no longer use gdcmHeader::GetLUTRGB
-      // since a lot of images have wrong info 
-      // in the Lookup Table Descriptors (0028,1101),...
-      {
+         // we no longer use gdcmHeader::GetLUTRGB
+         // since a lot of images have strange info 
+         // in the Lookup Table Descriptors (0028,1101),...
+         {
+         unsigned char * newDest = (unsigned char*) malloc(lgrTotale);
+         unsigned char * a = (unsigned char *)destination;
+
          unsigned char *lutR =(unsigned char *)GetPubElValVoidAreaByNumber(0x0028,0x1201);
          unsigned char *lutG =(unsigned char *)GetPubElValVoidAreaByNumber(0x0028,0x1202);
          unsigned char *lutB =(unsigned char *)GetPubElValVoidAreaByNumber(0x0028,0x1203);
-      
+
          if (lutR && lutG && lutB ) { // need to make RGB Pixels 
                                       // from grey Pixels 
                                       // and Lut R,Lut G,Lut B
+
             unsigned char * newDest = (unsigned char*) malloc(lgrTotale);
             int l = lgrTotale/3;
             memmove(newDest, destination, l);// move Gray pixels to temp area
 
             unsigned char * x = newDest;
-            unsigned char * a = (unsigned char *)destination;
-            int j;        
-            for (int i=0;i<l; i++) {
-               j=newDest[i]*2;  // Who can explain *why* we have to skip bytes
-               *a++ = lutR[j]; 
-               *a++ = lutG[j];
-               *a++ = lutB[j];
-            }
-            free(newDest);
-         
-            // now, it's an RGB image      
-           string spp = "3";
-            gdcmHeader::SetPubElValByNumber(spp,0x0028,0x0002); 
-           string rgb="RGB";
+
+               int j;
+               // See PS 3.3-2003 C.11.1.1.2 p 619
+               // 
+               int mult;
+               if ( GetLUTNbits()==16 && nb==8) mult=2; // See PS 3.3 
+               else mult=1;
+       
+               for (int i=0;i<l; i++) {
+                  j=newDest[i]*mult;
+                  *a++ = lutR[j]; 
+                  *a++ = lutG[j];
+                  *a++ = lutB[j];
+               }
+
+               free(newDest);
+        
+               // now, it's an RGB image      
+           std::string spp = "3";
+           gdcmHeader::SetPubElValByNumber(spp,0x0028,0x0002); 
+           std::string rgb="RGB";
            gdcmHeader::SetPubElValByNumber(rgb,0x0028,0x0004);
-            
+               
          } else { // need to make RGB Pixels (?)
-               // from grey Pixels (?!)
-               // and Gray Lut  (!?!) 
-            unsigned char *lutGray =(unsigned char *)GetPubElValVoidAreaByNumber(0x0028,0x1200); 
-                 // Well . I'll wait till I find such an image 
+                  // from grey Pixels (?!)
+                  // and Gray Lut  (!?!) 
+               unsigned char *lutGray =(unsigned char *)GetPubElValVoidAreaByNumber(0x0028,0x1200);
+                    // Well . I'll wait till I find such an image 
          }
          break;
-      }
+         }
    } 
     
    return lgrTotale; 
@@ -739,7 +717,7 @@ int gdcmFile::SetImageData(void * inData, size_t ExpectedSize) {
  */
 
 void gdcmFile::SetImageDataSize(size_t ImageDataSize) {
-   string content1;
+   std::string content1;
    char car[20];	
    // Assumes ElValue (0x7fe0, 0x0010) exists ...	
    sprintf(car,"%d",ImageDataSize);
@@ -766,7 +744,7 @@ void gdcmFile::SetImageDataSize(size_t ImageDataSize) {
  * @return	
  */
 
-int gdcmFile::WriteRawData (string fileName) {
+int gdcmFile::WriteRawData (std::string fileName) {
    FILE * fp1;
    fp1 = fopen(fileName.c_str(),"wb");
    if (fp1 == NULL) {
@@ -790,7 +768,7 @@ int gdcmFile::WriteRawData (string fileName) {
  * @return int acts as a boolean
  */
 
-int gdcmFile::WriteDcmImplVR (string fileName) {
+int gdcmFile::WriteDcmImplVR (std::string fileName) {
    return WriteBase(fileName, ImplicitVR);
 }
 
@@ -803,7 +781,7 @@ int gdcmFile::WriteDcmImplVR (string fileName) {
  */
  
 int gdcmFile::WriteDcmImplVR (const char* fileName) {
-   return WriteDcmImplVR (string (fileName));
+   return WriteDcmImplVR (std::string (fileName));
 }
 	
 /////////////////////////////////////////////////////////////////
@@ -814,7 +792,7 @@ int gdcmFile::WriteDcmImplVR (const char* fileName) {
  * @return int acts as a boolean
  */
 
-int gdcmFile::WriteDcmExplVR (string fileName) {
+int gdcmFile::WriteDcmExplVR (std::string fileName) {
    return WriteBase(fileName, ExplicitVR);
 }
 	
@@ -834,7 +812,7 @@ int gdcmFile::WriteDcmExplVR (string fileName) {
  * @return int acts as a boolean	
  */
 
-int gdcmFile::WriteAcr (string fileName) {
+int gdcmFile::WriteAcr (std::string fileName) {
    return WriteBase(fileName, ACR);
 }
 
@@ -847,7 +825,7 @@ int gdcmFile::WriteAcr (string fileName) {
  *
  * @return int acts as a boolean
  */
-int gdcmFile::WriteBase (string FileName, FileType type) {
+int gdcmFile::WriteBase (std::string FileName, FileType type) {
 
    FILE * fp1;
    fp1 = fopen(FileName.c_str(),"wb");
@@ -864,7 +842,36 @@ int gdcmFile::WriteBase (string FileName, FileType type) {
       fwrite("DICM",4,1,fp1);
    }
 
+   // --------------------------------------------------------------
+   // Special Patch to allow gdcm to re-write ACR-LibIDO formated images
+   //
+   // if recognition code tells us we dealt with a LibIDO image
+   // we reproduce on disk the switch between lineNumber and columnNumber
+   // just before writting ...
+
+   std::string rows, columns; 
+   if ( filetype == ACR_LIBIDO){
+         rows    = GetPubElValByNumber(0x0028, 0x0010);
+         columns = GetPubElValByNumber(0x0028, 0x0011);
+         SetPubElValByNumber(columns,  0x0028, 0x0010);
+         SetPubElValByNumber(rows   ,  0x0028, 0x0011);
+   }	
+   // ----------------- End of Special Patch ----------------
+
    gdcmHeader::Write(fp1, type);
+
+   // --------------------------------------------------------------
+   // Special Patch to allow gdcm to re-write ACR-LibIDO formated images
+   // 
+   // ...and we restore the Header to be Dicom Compliant again 
+   // just after writting
+
+   if (filetype == ACR_LIBIDO){
+         SetPubElValByNumber(rows   , 0x0028, 0x0010);
+         SetPubElValByNumber(columns, 0x0028, 0x0011);
+   }	
+   // ----------------- End of Special Patch ----------------
+
    fwrite(PixelData, lgrTotale, 1, fp1);
    fclose (fp1);
    return(1);