JPEGFragmentsInfo declares PixelReadConvert as friend.

[gdcm.git] / src / gdcmElementSet.cxx

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index 378ecebd68d8a6add4af0da117b0862c74ee891e..a59c4e19d4f41fe8d53fa4403615d13af1b8d685 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: 2005/10/26 06:07:26 $
-  Version:   $Revision: 1.68 $
+  Date:      $Date: 2005/10/27 11:39:34 $
+  Version:   $Revision: 1.70 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -55,16 +55,18 @@ void ElementSet::WriteContent(std::ofstream *fp, FileType filetype)
                                      i != TagHT.end(); 
                                     ++i)
    { 
-   // FIXME : find a trick to know if current object is a
-   //         gdcm::File or a gdcm::Document
-   //if ( dynamic_cast< File* > ( this ) ) { // ignore illegal groups }
-   
+       // 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() ) ) 
+          continue;
       // Skip 'Group Length' element, since it may be wrong.
       //       except for Group 0002 
        if ( (i->second)->GetElement() == 0x0000 
-         && (i->second)->GetElement() != 0x0002 )
-          continue;
-      
+         && (i->second)->GetGroup() != 0x0002 )
+          continue; 
        i->second->WriteContent(fp, filetype);
    } 
 }