Remaining hex replaced by std::hex

[gdcm.git] / src / gdcmHeader.cxx

diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index f8aaef2a6a346ad7a61661490e05f31937f8e83f..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.85 2003/09/24 11:37:10 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
@@ -905,7 +905,7 @@ void gdcmHeader::LoadElementValue(gdcmElValue * ElVal) {
    // are not loaded. Instead we leave a short notice of the offset of
    // the element content and it's length.
    if (length > MaxSizeLoadElementValue) {
-      ostringstream s;
+      std::ostringstream s;
       s << "gdcm::NotLoaded.";
       s << " Address:" << (long)ElVal->GetOffset();
       s << " Length:"  << ElVal->GetLength();
@@ -922,7 +922,7 @@ void gdcmHeader::LoadElementValue(gdcmElValue * ElVal) {
                
    if ( IsAnInteger(ElVal) ) {
       guint32 NewInt;
-      ostringstream s;
+      std::ostringstream s;
       int nbInt;
       if (vr == "US" || vr == "SS") {
          nbInt = length / 2;
@@ -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 << "\n";
+            << 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 << "\n";
+            << std::hex << Group << " " << Elem << std::endl;
        free(a);
        return NULL;
    }  
@@ -2012,7 +2012,7 @@ std::string gdcmHeader::GetTransferSyntaxName(void) {
   */
   
 int gdcmHeader::GetLUTLength(void) {
-   vector<std::string> tokens;
+   std::vector<std::string> tokens;
    int LutLength;
    //int LutDepth;
    //int LutNbits;
@@ -2030,7 +2030,7 @@ int gdcmHeader::GetLUTLength(void) {
       dbg.Verbose(0, "gdcmHeader::GetLUTLength: The CLUT R,G,B are not equal");
       return 0;   
    } 
-   cout << "Lut Description " << LutDescriptionR <<"\n";
+   cout << "Lut Description " << LutDescriptionR <<std::endl;
    tokens.erase(tokens.begin(),tokens.end()); // clean any previous value
    Tokenize (LutDescriptionR, tokens, "\\");
    LutLength=atoi(tokens[0].c_str());
@@ -2049,7 +2049,7 @@ int gdcmHeader::GetLUTLength(void) {
   */
   
 int gdcmHeader::GetLUTNbits(void) {
-   vector<std::string> tokens;
+   std::vector<std::string> tokens;
    //int LutLength;
    //int LutDepth;
    int LutNbits;
@@ -2167,7 +2167,7 @@ void * gdcmHeader::GetLUTRGB(void) {
       unsigned char * g = (unsigned char *)LutG;
       unsigned char * b = (unsigned char *)LutB;
       for(int i=0;i<l;i++) {
-      //cout << "lut16 " << i << " : " << *r << " " << *g << " " << *b << "\n";
+      //cout << "lut16 " << i << " : " << *r << " " << *g << " " << *b << std::endl;
       printf("lut 8 %d : %d %d %d \n",i,*r,*g,*b);
          *rgb++ = *r++;
          *rgb++ = *g++;