add '\0' after ostringstream to avoid oddities on Solrais

diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx
index 4d5a8713cd39b13456435ca59d886ab340d1ba19..3c007d56c7eb9bcb0cc94f9f5287a941e47348b7 100644 (file)
--- a/src/gdcmElValSet.cxx
+++ b/src/gdcmElValSet.cxx
@@ -18,15 +18,6 @@ gdcmElValSet::~gdcmElValSet() {
    NameHt.clear();
 }
 
-TagElValueHT & gdcmElValSet::GetTagHt(void) {
-       return tagHt;
-}
-
-
-ListTag & gdcmElValSet::GetListElem(void) {
-       return listElem;
-}
-
 /**
  * \ingroup gdcmElValSet
  * \brief   
@@ -63,12 +54,12 @@ int gdcmElValSet::CheckIfExistByNumber(guint16 Group, guint16 Elem ) {
 void gdcmElValSet::Print(std::ostream & os) {
 
    size_t o;
-   short int g, e;
+   unsigned short int g, e;
    TSKey v;
    std::string d2;
    gdcmTS * ts = gdcmGlobal::GetTS();
    
-   std::cout << "------------- using tagHt ----------------------------" << std::endl;
+   std::cout << "------------- using tagHt ---------------------" << std::endl;
    
    for (TagElValueHT::iterator tag = tagHt.begin();
           tag != tagHt.end();
@@ -100,19 +91,19 @@ void gdcmElValSet::Print(std::ostream & os) {
       os << std::endl;
    }
    
-   std::cout << "------------ using listElem -----------------" << std::endl;
+   std::cout << "------------ using listElem -------------------" << std::endl;
       
   guint32 lgth;
-  char greltag[9];  //group element tag
+  char greltag[10];  //group element tag
    
-  for (std::list<gdcmElValue*>::iterator i = listElem.begin();  
+  for (ListTag::iterator i = listElem.begin();  
           i != listElem.end();
           ++i){
       g = (*i)->GetGroup();
       e = (*i)->GetElement();
-      sprintf(greltag,"%04x|%04x",g,e);      
       v = (*i)->GetValue();
       o = (*i)->GetOffset();
+      sprintf(greltag,"%04x|%04x",g,e);           
       d2 = _CreateCleanString(v);  // replace non printable characters by '.'
       os << greltag << ": lgth : ";
       lgth = (*i)->GetReadLength();

diff --git a/src/gdcmElValSet.h b/src/gdcmElValSet.h
index 0d22c603b68fa15257a072c400353ddd1d805859..0140b1385147e1bb687ddf84039f12987a0f26b3 100644 (file)
--- a/src/gdcmElValSet.h
+++ b/src/gdcmElValSet.h
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmElValSet.h,v 1.18 2003/11/10 09:21:40 jpr Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmElValSet.h,v 1.19 2003/11/13 18:08:34 jpr Exp $
 
 #ifndef GDCMELVALSET_H
 #define GDCMELVALSET_H
@@ -39,8 +39,8 @@ public:
    std::string  GetElValueByNumber(guint16 group, guint16 element);
    std::string  GetElValueByName  (std::string);
        
-   TagElValueHT & GetTagHt(void);      
-   ListTag & GetListElem(void);        
+   TagElValueHT & GetTagHt(void)     {return tagHt;};  
+   ListTag      & GetListElem(void)  {return listElem;};       
        
    int SetElValueByNumber(std::string content, guint16 group, guint16 element);
    int SetElValueByName  (std::string content, std::string TagName);

diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index 09eb2d4e71c0993f18e41b0ba560102aa0c74df1..e9ae38fc4c71c315e2f68879429bb3a6fc330da7 100644 (file)
--- a/src/gdcmHeader.cxx
+++ b/src/gdcmHeader.cxx
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.116 2003/11/13 10:23:40 malaterre Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.117 2003/11/13 18:08:34 jpr Exp $
 
 #include "gdcmHeader.h"
 
@@ -1011,7 +1011,8 @@ void gdcmHeader::LoadElementValue(gdcmElValue * ElVal) {
                s << NewInt;
             }
          }
-      }                                        
+      }        
+      s << '\0'; // to avoid oddities on Solaris
       ElVal->SetValue(s.str());
       return;  
    }
@@ -1791,7 +1792,7 @@ void gdcmHeader::LoadElements(void) {
    //     LoadElementValue(tag->second);
    //}
    
-     for (std::list<gdcmElValue*>::iterator i = GetListElem().begin();  
+     for (ListTag::iterator i = GetListElem().begin();  
           i != GetListElem().end();
           ++i){
         LoadElementValue(*i);