Remaining hex replaced by std::hex

          dec             std::hex

(printf never messed us up as much, or is it just me?)

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index 7e4f586b8c7ad32a8de67a00f4dd97db96e9f58f..ad8945f586311372f9e058163c040ac04e12329b 100644 (file)
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -84,8 +84,8 @@ void gdcmDict::Print(std::ostream& os) {
 void gdcmDict::PrintByKey(std::ostream& os) {
    for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag){
       os << "Tag : ";
-      os << "(" << hex << tag->second->GetGroup() << ',';
-      os << hex << tag->second->GetElement() << ") = " << dec;
+      os << "(" << std::hex << tag->second->GetGroup() << ',';
+      os << std::hex << tag->second->GetElement() << ") = " << std::dec;
       os << tag->second->GetVR() << ", ";
       os << tag->second->GetFourth() << ", ";
       os << tag->second->GetName() << "."  << std::endl;
@@ -105,7 +105,7 @@ void gdcmDict::PrintByName(std::ostream& os) {
       os << tag->second->GetVR() << ", ";
       os << tag->second->GetFourth() << ", ";
       os << "(" << std::hex << tag->second->GetGroup() << ',';
-      os << std::hex << tag->second->GetElement() << ") = " << dec << std::endl;
+      os << std::hex << tag->second->GetElement() << ") = " << std::dec << std::endl;
    }
 }
 

diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx
index 000042a55bc34de61cbdb7b7774ff2b8e86e98b1..e0b61a3f9a8cc8d4dc20c221593eb0efd61f6778 100644 (file)
--- a/src/gdcmElValSet.cxx
+++ b/src/gdcmElValSet.cxx
@@ -79,7 +79,7 @@ void gdcmElValSet::Print(ostream & os) {
       os << tag->first << ": ";
       os << " lgr : " << tag->second->GetLength();
       os << ", Offset : " << o;
-      os << " x(" << hex << o << dec << ") ";
+      os << " x(" << std::hex << o << std::dec << ") ";
       os << "\t[" << tag->second->GetVR()    << "]";
       os << "\t[" << tag->second->GetName()  << "]";       
       os << "\t[" << d2 << "]";
@@ -405,7 +405,7 @@ void gdcmElValSet::WriteElements(FileType type, FILE * _fp) {
       val = tag2->second->GetValue().c_str();
       vr =  tag2->second->GetVR();
       
-     // cout << "Tag "<< hex << gr << " " << el << std::endl;
+     // cout << "Tag "<< std::hex << gr << " " << el << std::endl;
 
       if ( type == ACR ) { 
          if (gr < 0x0008)   continue; // ignore pure DICOM V3 groups

diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index 4fe140503fa807c74990c141dab13f08cea6180d..1c65feb5d2bf9c0f2058eed2babb374313a14282 100644 (file)
--- a/src/gdcmHeader.cxx
+++ b/src/gdcmHeader.cxx
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.87 2003/09/24 13:36:15 jpr Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.88 2003/09/24 13:45:11 jpr Exp $
 
 //This is needed when compiling in debug mode
 #ifdef _MSC_VER
@@ -1764,7 +1764,7 @@ void * gdcmHeader::LoadElementVoidArea(guint16 Group, guint16 Elem) {
    void * a = malloc(l);
    if(!a) {
        cout << "Big Broblem (LoadElementVoidArea, malloc) " 
-            << hex << Group << " " << Elem << std::endl;
+            << std::hex << Group << " " << Elem << std::endl;
        return NULL;
    }  
    int res = PubElValSet.SetVoidAreaByNumber(a, Group, Elem);
@@ -1772,7 +1772,7 @@ void * gdcmHeader::LoadElementVoidArea(guint16 Group, guint16 Elem) {
    size_t l2 = fread(a, 1, l ,fp);
    if(l != l2) {
        cout << "Big Broblem (LoadElementVoidArea, fread) " 
-            << hex << Group << " " << Elem << std::endl;
+            << std::hex << Group << " " << Elem << std::endl;
        free(a);
        return NULL;
    }