COMP: Fix comp on gcc295

[gdcm.git] / src / gdcmSQItem.cxx

diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx
index ac3442dde84108873911b72407a18fac2171a06b..073093641b8136986ca139f6472152158983c87b 100644 (file)
--- a/src/gdcmSQItem.cxx
+++ b/src/gdcmSQItem.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSQItem.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/10/12 04:35:47 $
-  Version:   $Revision: 1.29 $
+  Date:      $Date: 2004/11/25 15:46:11 $
+  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
@@ -23,10 +23,10 @@
 #include "gdcmGlobal.h"
 #include "gdcmUtil.h"
 #include "gdcmDebug.h"
+#include <fstream>
 
 namespace gdcm 
 {
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
@@ -44,13 +44,13 @@ SQItem::SQItem(int depthLevel )
  */
 SQItem::~SQItem() 
 {
-   for(ListDocEntry::iterator cc = docEntries.begin();
-       cc != docEntries.end();
-       ++cc)
+   for(ListDocEntry::iterator cc = DocEntries.begin();
+                             cc != DocEntries.end();
+                             ++cc)
    {
-      delete (*cc);
+      delete *cc;
    }
-   docEntries.clear();
+   DocEntries.clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -60,6 +60,7 @@ SQItem::~SQItem()
  */
  void SQItem::Print(std::ostream& os)
  {
+   os << "S ";
    std::ostringstream s;
 
    if (SQDepthLevel > 0)
@@ -69,9 +70,9 @@ SQItem::~SQItem()
          s << "   | " ;
       }
    }
-   std::cout << s.str() << " --- SQItem number " << SQItemNumber  << std::endl;
-   for (ListDocEntry::iterator i  = docEntries.begin();
-                               i != docEntries.end();
+   //std::cout << s.str() << " --- SQItem number " << SQItemNumber  << std::endl;
+   for (ListDocEntry::iterator i  = DocEntries.begin();
+                               i != DocEntries.end();
                              ++i)
    {
       DocEntry* Entry = *i;
@@ -96,22 +97,26 @@ SQItem::~SQItem()
  * \ingroup SQItem
  * \brief   canonical Writer
  */
-void SQItem::Write(FILE* fp,FileType filetype)
+void SQItem::WriteContent(std::ofstream* fp, FileType filetype)
 {
+   int j;
    uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff };
    uint16_t itemt[4]= { 0xfffe, 0xe00d, 0xffff, 0xffff };
 
     //we force the writting of an 'Item' Start Element
     // because we want to write the Item as a 'no Length' item
-   fwrite(&item[0],8,1,fp);  // fffe e000 ffff ffff 
+   for(j=0;j<4;++j)
+   {
+      binary_write( *fp, item[j]);  // fffe e000 ffff ffff 
+   }
      
-   for (ListDocEntry::iterator i = docEntries.begin();  
-        i != docEntries.end();
-        ++i)
+   for (ListDocEntry::iterator it = DocEntries.begin();  
+                              it != DocEntries.end();
+                             ++it)
    {   
       // we skip delimitors (start and end one) because 
       // we force them as 'no length'
-      if ( (*i)->GetGroup() == 0xfffe )
+      if ( (*it)->GetGroup() == 0xfffe )
       {
          continue;
       }
@@ -119,18 +124,21 @@ void SQItem::Write(FILE* fp,FileType filetype)
       // Fix in order to make some MR PHILIPS images e-film readable
       // see gdcmData/gdcm-MR-PHILIPS-16-Multi-Seq.dcm:
       // we just *always* ignore spurious fffe|0000 tag ! 
-      if ( (*i)->GetGroup() == 0xfffe && (*i)->GetElement() == 0x0000 )
+      if ( (*it)->GetGroup() == 0xfffe && (*it)->GetElement() == 0x0000 )
       {
          break; // FIXME : continue; ?!?
       }
 
-      (*i)->Write(fp, filetype);
+      (*it)->WriteContent(fp, filetype);
    }
       
     //we force the writting of an 'Item Delimitation' item
     // because we wrote the Item as a 'no Length' item
-   fwrite(&itemt[0],8,1,fp);  // fffe e000 ffff ffff 
-
+   for(j=0;j<4;++j)
+   {
+      binary_write( *fp, itemt[j]);  // fffe e000 ffff ffff 
+   }
+ 
 }
 
 //-----------------------------------------------------------------------------
@@ -140,7 +148,7 @@ void SQItem::Write(FILE* fp,FileType filetype)
  */
 bool SQItem::AddEntry(DocEntry* entry)
 {
-   docEntries.push_back(entry);
+   DocEntries.push_back(entry);
    //TODO : check if it worked
    return true;
 }   
@@ -158,10 +166,12 @@ bool SQItem::AddEntry(DocEntry* entry)
  * @return  true if element was found or created successfully
  */
 
-bool SQItem::SetEntryByNumber(std::string val, uint16_t group, 
-                                  uint16_t element)
+bool SQItem::SetEntryByNumber(std::string const & val, uint16_t group, 
+                              uint16_t element)
 {
-   for(ListDocEntry::iterator i = docEntries.begin(); i != docEntries.end(); ++i)
+   for(ListDocEntry::iterator i = DocEntries.begin(); 
+                              i != DocEntries.end(); 
+                            ++i)
    { 
       if ( (*i)->GetGroup() == 0xfffe && (*i)->GetElement() == 0xe000 ) 
       {
@@ -182,13 +192,12 @@ bool SQItem::SetEntryByNumber(std::string val, uint16_t group,
             Dict *pubDict = Global::GetDicts()->GetDefaultPubDict();
             // if the invoked (group,elem) doesn't exist inside the Dictionary
             // we create a VirtualDictEntry
-            DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group,
-                                                                     element);
+            DictEntry *dictEntry = pubDict->GetDictEntryByNumber(group, element);
             if (dictEntry == NULL)
             {
                dictEntry = 
                   Global::GetDicts()->NewVirtualDictEntry(group, element,
-                                                              "UN", "??", "??");
+                                                          "UN", "??", "??");
             } 
             // we assume the constructor didn't fail
             entry = new ValEntry(dictEntry);
@@ -212,7 +221,7 @@ bool SQItem::SetEntryByNumber(std::string val, uint16_t group,
             entry->SetValue(val); 
          }
          entry->SetLength(val.length());
-         docEntries.insert(i,entry);
+         DocEntries.insert(i,entry);
 
          return true;
       }   
@@ -238,8 +247,8 @@ bool SQItem::SetEntryByNumber(std::string val, uint16_t group,
  */
 DocEntry* SQItem::GetDocEntryByNumber(uint16_t group, uint16_t element)
 {
-   for(ListDocEntry::iterator i = docEntries.begin();
-                              i != docEntries.end(); ++i)
+   for(ListDocEntry::iterator i = DocEntries.begin();
+                              i != DocEntries.end(); ++i)
    {
       if ( (*i)->GetGroup() == group && (*i)->GetElement() == element )
       {
@@ -256,8 +265,8 @@ DocEntry* SQItem::GetDocEntryByNumber(uint16_t group, uint16_t element)
 
 std::string SQItem::GetEntryByNumber(uint16_t group, uint16_t element)
 {
-   for(ListDocEntry::iterator i = docEntries.begin();
-                              i != docEntries.end(); ++i)
+   for(ListDocEntry::iterator i = DocEntries.begin();
+                              i != DocEntries.end(); ++i)
    {
       if ( (*i)->GetGroup() == group && (*i)->GetElement() == element)
       {