X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmHeader.cxx;h=1c65feb5d2bf9c0f2058eed2babb374313a14282;hb=9d7bc1062abc4ca53c072f752c8938b08748fff8;hp=52ff002cd456d0f2f315edc2c21a15ea7aea7243;hpb=52364c14a6ae132d7cedcfca51f49a6f411316a3;p=gdcm.git diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx index 52ff002c..1c65feb5 100644 --- a/src/gdcmHeader.cxx +++ b/src/gdcmHeader.cxx @@ -1,4 +1,4 @@ -// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.86 2003/09/24 13:00:59 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 << 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; } @@ -2012,7 +2012,7 @@ std::string gdcmHeader::GetTransferSyntaxName(void) { */ int gdcmHeader::GetLUTLength(void) { - vector tokens; + std::vector tokens; int LutLength; //int LutDepth; //int LutNbits; @@ -2049,7 +2049,7 @@ int gdcmHeader::GetLUTLength(void) { */ int gdcmHeader::GetLUTNbits(void) { - vector tokens; + std::vector tokens; //int LutLength; //int LutDepth; int LutNbits;