X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSQItem.cxx;h=b6c5dd0d31c9a9045d7abbc1ea2b0a5fbe2ff82d;hb=c1a305b54c1a9dd1bfe2173940ba84ccd1b4bb27;hp=310be6b8dc81cd90f4c033a418f8289af333a0d7;hpb=5ac625c72835828d687ebdef878691d0913ae41b;p=gdcm.git

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index 310be6b8..b6c5dd0d 100644
--- a/src/gdcmSQItem.cxx
+++ b/src/gdcmSQItem.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/29 12:48:47 $
-  Version:   $Revision: 1.81 $
+  Date:      $Date: 2007/10/08 15:20:17 $
+  Version:   $Revision: 1.88 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -25,7 +25,7 @@
 
 #include <fstream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -54,11 +54,12 @@ SQItem::~SQItem()
  * @param fp     file pointer to an already open file. 
  * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
  */
-void SQItem::WriteContent(std::ofstream *fp, FileType filetype)
+void SQItem::WriteContent(std::ofstream *fp, FileType filetype, 
+                               bool , bool )
 {
    int j;
    uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff };
-   uint16_t itemt[4]= { 0xfffe, 0xe00d, 0xffff, 0xffff };
+   uint16_t itemt[4]= { 0xfffe, 0xe00d, 0x0000, 0x0000 };
 
     //we force the writting of an 'Item' Start Element
     // because we want to write the Item as a 'No Length' item
@@ -87,15 +88,16 @@ void SQItem::WriteContent(std::ofstream *fp, FileType filetype)
                  // --> makes no difference since the only bugged file we have
                  // contains 'impossible tag' fffe|0000 in last position !                            
       }
-
-      (*it)->WriteContent(fp, filetype);
+      // false : we are not in MetaElements
+      // true  : we are inside a Sequence
+      (*it)->WriteContent(fp, filetype, false, true);
    }
       
     //we force the writting of an 'Item Delimitation' item
     // because we wrote the Item as a 'no Length' item
    for(j=0;j<4;++j)
    {
-      binary_write( *fp, itemt[j]);  // fffe e000 ffff ffff 
+      binary_write( *fp, itemt[j]);  // fffe e000 0000 0000
    } 
 }
 
@@ -157,7 +159,6 @@ bool SQItem::AddEntry(DocEntry *entry)
   
    ++it;
    insertSpot = it;
-   //++insertSpot; // ?!?
    DocEntries.insert(insertSpot, entry); 
    entry->Register();
    return true;