X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmParser.cxx;h=2bb771cbd2f1236d005d81e71ff6d28939d5eb71;hb=7b8dcad5fbb9b248952ad6819ef984e7880ef81e;hp=df9f48f2f370c2c4cc25ff589e58a2576521e200;hpb=cc65499518ef9cab0d2b3d348bc15cfc2990a31a;p=gdcm.git

diff --git a/src/gdcmParser.cxx b/src/gdcmParser.cxx
index df9f48f2..2bb771cb 100644
--- a/src/gdcmParser.cxx
+++ b/src/gdcmParser.cxx
@@ -353,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);
 }
@@ -434,7 +434,7 @@ bool gdcmParser::Write(FILE *fp, FileType type) {
       UpdateGroupLength(true,ACR);
 */
 
-   WriteEntries(type, fp);
+   WriteEntries(fp,type);
    return(true);
  }
 
@@ -755,9 +755,7 @@ void *gdcmParser::LoadEntryVoidArea(guint16 Group, guint16 Elem)
    	free(a);
    	return NULL;
    }
-   cout << hex << Group << " " << Elem << "loaded" <<endl;
-   Element->SetPrintLevel(2);
-   Element->Print();
+
    return a;  
 }
 
@@ -1006,7 +1004,7 @@ void gdcmParser::UpdateGroupLength(bool SkipSequence, FileType type) {
  *          (ACR-NEMA, ExplicitVR, ImplicitVR)
  * @param   _fp already open file pointer
  */
-void gdcmParser::WriteEntries(FileType type, FILE * _fp) 
+void gdcmParser::WriteEntries(FILE *_fp,FileType type)
 {
    guint16 gr, el;
    guint32 lgr;
@@ -1062,19 +1060,19 @@ void gdcmParser::WriteEntries(FileType type, FILE * _fp)
       {
          // EXPLICIT VR
          guint16 z=0, shortLgr;
-	 if (vr == "Unknown") { // Unknown was 'written'	 
+	 if (vr == "unkn") { // Unknown was 'written'	 
             shortLgr=lgr;
             fwrite ( &shortLgr,(size_t)2 ,(size_t)1 ,_fp);
             fwrite ( &z,  (size_t)2 ,(size_t)1 ,_fp);
 	 } else {	 
             if (gr != 0xfffe) { // NO value for 'delimiters'
-	      if (vr == "Unknown") // Unknown was 'written'
+	      if (vr == "unkn") // Unknown was 'written'
 	         fwrite(&z,(size_t)2 ,(size_t)1 ,_fp);
 	      else  	 
                  fwrite (vr.c_str(),(size_t)2 ,(size_t)1 ,_fp);
             }
 	 
-            if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || gr == 0xfffe) // JPR
+            if ( (vr == "OB") || (vr == "OW") || (vr == "SQ") || gr == 0xfffe)
             {
                if (gr != 0xfffe)
 	          fwrite ( &z,  (size_t)2 ,(size_t)1 ,_fp);
@@ -1532,7 +1530,6 @@ void gdcmParser::FindHeaderEntryVR( gdcmHeaderEntry *Entry)
       return;
 
    char VR[3];
-   int lgrLue;
 
    long PositionOnEntry = ftell(fp);
    // Warning: we believe this is explicit VR (Value Representation) because
@@ -1543,7 +1540,7 @@ void gdcmParser::FindHeaderEntryVR( gdcmHeaderEntry *Entry)
    // is in explicit VR and try to fix things if it happens not to be
    // the case.
    
-   lgrLue=fread (&VR, (size_t)2,(size_t)1, fp);
+   int lgrLue=fread (&VR, (size_t)2,(size_t)1, fp); // lgrLue not used
    VR[2]=0;
    if(!CheckHeaderEntryVR(Entry,VR))
    {
@@ -1598,14 +1595,23 @@ bool gdcmParser::CheckHeaderEntryVR(gdcmHeaderEntry *Entry, VRKey vr)
       sprintf(msg,"Falsely explicit vr file (%04x,%04x)\n", 
                    Entry->GetGroup(),Entry->GetElement());
       dbg.Verbose(1, "gdcmParser::FindVR: ",msg);
-
+      if (Entry->GetGroup()%2 && Entry->GetElement() == 0x0000) { // Group length is UL !
+         gdcmDictEntry* NewEntry = NewVirtualDictEntry(
+                                   Entry->GetGroup(),Entry->GetElement(),
+                                   "UL","FIXME","Group Length");
+         Entry->SetDictEntry(NewEntry);			      			      			      
+      }
       return(false);
    }
 
    if ( Entry->IsVRUnknown() ) 
    {
       // When not a dictionary entry, we can safely overwrite the VR.
-      Entry->SetVR(vr);
+      if (Entry->GetElement() == 0x0000) { // Group length is UL !
+         Entry->SetVR("UL");
+      } else {
+         Entry->SetVR(vr);
+      }
    }
    else if ( Entry->GetVR() != vr ) 
    {
@@ -1670,7 +1676,6 @@ std::string gdcmParser::GetHeaderEntryValue(gdcmHeaderEntry *Entry)
             s << NewInt32;
          }
       }
-
 #ifdef GDCM_NO_ANSI_STRING_STREAM
       s << std::ends; // to avoid oddities on Solaris
 #endif //GDCM_NO_ANSI_STRING_STREAM
@@ -1764,7 +1769,7 @@ void gdcmParser::FixHeaderEntryFoundLength(gdcmHeaderEntry *Entry, guint32 Found
      
    if (FoundLength%2) {
       std::cout << "Warning : Tag with uneven length " << FoundLength 
-         <<  "in x(" << std::hex << gr << "," << el <<")" << std::endl;
+         <<  " in x(" << std::hex << gr << "," << el <<")" << std::dec << std::endl;
    }
       
    // Sorry for the patch!  
@@ -2343,7 +2348,7 @@ gdcmHeaderEntry *gdcmParser::NewHeaderEntryByName(std::string Name)
 {
    gdcmDictEntry *NewTag = GetDictEntryByName(Name);
    if (!NewTag)
-      NewTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", "Unknown", Name);
+      NewTag = NewVirtualDictEntry(0xffff, 0xffff, "LO", "unkn", Name);
 
    gdcmHeaderEntry* NewEntry = new gdcmHeaderEntry(NewTag);
    if (!NewEntry)