Fix mistypings

[gdcm.git] / src / gdcmElementSet.cxx

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index e7855bdd16c051d90cd46b2f296d6eceeb5a88f0..31f74ae64890537f8d0d688992a557e32a3364ad 100644 (file)
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/02/16 20:06:14 $
-  Version:   $Revision: 1.73 $
+  Date:      $Date: 2008/05/19 09:25:42 $
+  Version:   $Revision: 1.80 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,7 +21,7 @@
 #include "gdcmSeqEntry.h"
 #include "gdcmDataEntry.h"
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -47,27 +47,52 @@ ElementSet::~ElementSet()
   * \brief   Writes the Header Entries (Dicom Elements)
   *          from the H Table
   * @param fp ofstream to write to  
-  * @param filetype filetype
+  * @param filetype    ExplicitVR/ImplicitVR/ACR/ACR_LIBIDO/JPEG/JPEG2000/...
   */ 
-void ElementSet::WriteContent(std::ofstream *fp, FileType filetype)
+void ElementSet::WriteContent(std::ofstream *fp, FileType filetype, bool dummy, bool dummy2)
 {
+   bool insideMetaElements     = false;
+   bool yetOutsideMetaElements = false;
+   (void)dummy2;(void)dummy;
+   
    for (TagDocEntryHT::const_iterator i = TagHT.begin(); 
                                      i != TagHT.end(); 
                                     ++i)
-   { 
+   {
+        int group = (i->second)->GetGroup();
+       
+       if (yetOutsideMetaElements==false && group == 0x0002)
+          insideMetaElements = true;
+    
+       if (insideMetaElements == true && group != 0x0002)
+       {
+          yetOutsideMetaElements = true;
+          insideMetaElements     = false;
+       }
+   
        // depending on the gdcm::Document type 
        // (gdcm::File; gdcm::DicomDir, (more to come ?)
        // some groups *cannot* be present.
        // We hereby protect gdcm for writting stupid things
        // if they were found in the original document. 
-       if ( !MayIWrite( (i->second)->GetGroup() ) ) 
+       if ( !MayIWrite( group ) )
           continue;
+  
       // Skip 'Group Length' element, since it may be wrong.
-      //       except for Group 0002 
-       if ( (i->second)->GetElement() == 0x0000 
-         && (i->second)->GetGroup() != 0x0002 )
-          continue; 
-       i->second->WriteContent(fp, filetype);
+      //       except for Group 0x0002
+      // ( keep it as well for Group 0x0008 of ACR Files, 
+      //  since some ACR readers *need* it )
+      
+       if ( (i->second)->GetElement() != 0x0000 
+           || 
+            (  (i->second)->GetGroup() == 0x0002 
+             ||( (filetype == ACR || filetype == ACR_LIBIDO ) && (i->second)->GetGroup() == 0x0008 ) )
+        )
+       {           
+             // There are DocEntries, written recursively
+             // false : we are outside any Sequence
+             i->second->WriteContent(fp, filetype, insideMetaElements, false );
+       }             
    } 
 }