* gdcmDirList : to parse a hard drive directory in recursive (or not)

[gdcm.git] / src / gdcmParser.cxx

diff --git a/src/gdcmParser.cxx b/src/gdcmParser.cxx
index f20135a53bb57f7acfee3dbaa149bc971dc8477a..b442206bc19ab9498087475d8ec9b1901a8b0b6d 100644 (file)
--- a/src/gdcmParser.cxx
+++ b/src/gdcmParser.cxx
@@ -224,10 +224,12 @@ bool gdcmParser::SetShaDict(DictKey dictName){
  *         false otherwise. 
  */
 bool gdcmParser::IsReadable(void) { 
-   if(filetype==Unknown)
+   if(filetype==Unknown) {
       return(false);
-   if(listEntries.size()<=0)
+   }
+   if(listEntries.size()<=0) {    
       return(false);
+   }
 
    return(true);
 }
@@ -351,10 +353,10 @@ FILE *gdcmParser::OpenFile(bool exception_on_error)
        return(fp);
 
     fclose(fp);
-    dbg.Verbose(0, "gdcmParser::gdcmParser not DICOM/ACR", filename.c_str());
+    dbg.Verbose(0, "gdcmParser::OpenFile not DICOM/ACR", filename.c_str());
   }
   else {
-    dbg.Verbose(0, "gdcmParser::gdcmParser cannot open file", filename.c_str());
+    dbg.Verbose(0, "gdcmParser::OpenFile cannot open file", filename.c_str());
   }
   return(NULL);
 }
@@ -753,6 +755,7 @@ void *gdcmParser::LoadEntryVoidArea(guint16 Group, guint16 Elem)
        free(a);
        return NULL;
    }
+
    return a;  
 }
 
@@ -1010,6 +1013,7 @@ void gdcmParser::WriteEntries(FileType type, FILE * _fp)
    guint32 val_uint32;
    guint16 val_uint16;
    guint16 valZero =0;
+   void *voidArea;
    std::vector<std::string> tokens;
    
    // TODO : function CheckHeaderCoherence to be written
@@ -1033,6 +1037,8 @@ void gdcmParser::WriteEntries(FileType type, FILE * _fp)
       lgr = (*tag2)->GetReadLength();
       val = (*tag2)->GetValue().c_str();
       vr =  (*tag2)->GetVR();
+      voidArea = (*tag2)->GetVoidArea();
+      
       if ( type == ACR ) 
       { 
          if (gr < 0x0008)   continue; // ignore pure DICOM V3 groups
@@ -1089,6 +1095,11 @@ void gdcmParser::WriteEntries(FileType type, FILE * _fp)
       if (vr == "SQ")  continue; // no "value" to write for the SEQuences
       if (gr == 0xfffe)continue;
       
+      if (voidArea != NULL) { // there is a 'non string' LUT, overlay, etc
+         fwrite ( voidArea,(size_t)lgr ,(size_t)1 ,_fp); // Elem value
+        continue;            
+      }
+      
       if (vr == "US" || vr == "SS") 
       {
          tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
@@ -1238,7 +1249,9 @@ void gdcmParser::LoadHeaderEntries(void) {
       LoadEntryVoidArea(0x0028,0x1221);  // Segmented Red   Palette Color LUT Data
       LoadEntryVoidArea(0x0028,0x1222);  // Segmented Green Palette Color LUT Data
       LoadEntryVoidArea(0x0028,0x1223);  // Segmented Blue  Palette Color LUT Data
-   }   
+   } 
+   //FIXME : how to use it?
+   LoadEntryVoidArea(0x0028,0x3006);  //LUT Data (CTX dependent)     
    
    // --------------------------------------------------------------
    // Special Patch to allow gdcm to read ACR-LibIDO formated images
@@ -1749,7 +1762,7 @@ void gdcmParser::FixHeaderEntryFoundLength(gdcmHeaderEntry *Entry, guint32 Found
      
    if (FoundLength%2) {
       std::cout << "Warning : Tag with uneven length " << FoundLength 
-          <<  "in x(" << hex << gr << "," << el <<")" << std::endl;
+         <<  "in x(" << std::hex << gr << "," << el <<")" << std::endl;
    }
       
    // Sorry for the patch!  
@@ -1835,7 +1848,9 @@ bool gdcmParser::IsHeaderEntryAnInteger(gdcmHeaderEntry *Entry) {
        // For *regular* headers, the test is useless..
        // lets's print a warning message and go on, 
        // instead of giving up with an error message
-       std::cout << s.str().c_str() << std::endl;
+       
+       //std::cout << s.str().c_str() << std::endl;
+       
         // dbg.Error("gdcmParser::IsHeaderEntryAnInteger",
         //    s.str().c_str());     
       }
@@ -2018,21 +2033,21 @@ bool gdcmParser::CheckSwap() {
       // * the 4 bytes of the first tag (0002, 0000),or (0002, 0001)
       // i.e. a total of  136 bytes.
       entCur = deb + 136;
-      // FIXME
-      // Use gdcmParser::dicom_vr to test all the possibilities
-      // instead of just checking for UL, OB and UI !?
-      
+     
       // FIXME : FIXME:
       // Sometimes (see : gdcmData/icone.dcm) group 0x0002 *is* Explicit VR,
       // but elem 0002,0010 (Transfert Syntax) tells us the file is *Implicit* VR.
       // -and it is !- 
       
-      // The following test is *absolutely useless*, since everything *goes right*
-      // with a *100 % wrong* assumption !!!
-      
       if( (memcmp(entCur, "UL", (size_t)2) == 0) ||
          (memcmp(entCur, "OB", (size_t)2) == 0) ||
-         (memcmp(entCur, "UI", (size_t)2) == 0) )   
+         (memcmp(entCur, "UI", (size_t)2) == 0) ||       
+         (memcmp(entCur, "CS", (size_t)2) == 0) )  // CS, to remove later
+                                                   // when Write DCM *adds*
+      // FIXME
+      // Use gdcmParser::dicom_vr to test all the possibilities
+      // instead of just checking for UL, OB and UI !?                                             // group 0000 
+                                                    
       {
          filetype = ExplicitVR;
          dbg.Verbose(1, "gdcmParser::CheckSwap:",
@@ -2044,6 +2059,7 @@ bool gdcmParser::CheckSwap() {
          dbg.Verbose(1, "gdcmParser::CheckSwap:",
                      "not an explicit Value Representation");
       }
+      
       if (net2host) 
       {
          sw = 4321;