Trying to normalize JPEG Writing (not yet finished)

[gdcm.git] / src / gdcmDicomDirMeta.cxx

diff --git a/src/gdcmDicomDirMeta.cxx b/src/gdcmDicomDirMeta.cxx
index dae4d4e3dcc5ad22a973945a3e008bd3dc92ad8c..37c66051e5ea136daf2263f22e94600db4199fc7 100644 (file)
--- a/src/gdcmDicomDirMeta.cxx
+++ b/src/gdcmDicomDirMeta.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirMeta.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/02/16 20:06:13 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2007/07/26 08:36:49 $
+  Version:   $Revision: 1.38 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,7 +22,8 @@
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
 #include "gdcmDataEntry.h"
-namespace gdcm 
+
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -52,10 +53,11 @@ DicomDirMeta::~DicomDirMeta()
 /**
  * \brief   Writes the Meta Elements
  * @param fp ofstream to write to
- * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
+ * @param filetype type of the file (ImplicitVR, ExplicitVR, ...)
  * @return
  */ 
-void DicomDirMeta::WriteContent(std::ofstream *fp, FileType filetype)
+void DicomDirMeta::WriteContent(std::ofstream *fp, FileType filetype,
+                                                     bool insideMetaElements)
 {
    // 'File Meta Information Version'
    
@@ -80,10 +82,11 @@ void DicomDirMeta::WriteContent(std::ofstream *fp, FileType filetype)
    e0000->SetString(sLen.str());
    
    for (ListDocEntry::iterator i = DocEntries.begin();  
-                              i != DocEntries.end();
-                              ++i)
-   {
-      (*i)->WriteContent(fp, filetype);
+                               i!= DocEntries.end();
+                             ++i)
+   {   
+   // true : we are in MetaElements
+      (*i)->WriteContent(fp, filetype, true);
    }
 }