X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=8f92ab338f7651bf8cef507ad764d97e9b1977a9;hb=1d55bdb6bbd0ae16c1788dfa2450846f34cc9629;hp=b310e37e5386ba53d3ecae0cf8ed52d347f013f5;hpb=09eb38b5b2fe392e64390b7c2eadf822541f92ba;p=gdcm.git diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx index b310e37e..8f92ab33 100644 --- a/src/gdcmValEntry.cxx +++ b/src/gdcmValEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmValEntry.cxx,v $ Language: C++ - Date: $Date: 2005/03/22 11:39:04 $ - Version: $Revision: 1.59 $ + Date: $Date: 2005/06/24 10:55:59 $ + Version: $Revision: 1.62 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -29,7 +29,7 @@ namespace gdcm { //----------------------------------------------------------------------------- -#define MAX_SIZE_PRINT_ELEMENT_VALUE 0x7fffffff; +#define MAX_SIZE_PRINT_ELEMENT_VALUE 0x7fffffff uint32_t ValEntry::MaxSizePrintEntry = MAX_SIZE_PRINT_ELEMENT_VALUE; //----------------------------------------------------------------------------- // Constructor / Destructor @@ -146,13 +146,13 @@ void ValEntry::SetValue(std::string const &val) if ( l != 0) // To avoid to be cheated by 'zero length' integers { const VRKey &vr = GetVR(); - if( vr == "US" || vr == "SS" ) + if ( vr == "US" || vr == "SS" ) { // for multivaluated items l = (Util::CountSubstring(val, "\\") + 1) * 2; ContentEntry::SetValue(val); } - else if( vr == "UL" || vr == "SL" ) + else if ( vr == "UL" || vr == "SL" ) { // for multivaluated items l = (Util::CountSubstring(val, "\\") + 1) * 4;; @@ -214,7 +214,7 @@ void ValEntry::Print(std::ostream &os, std::string const &) TSAtr v = GetValue(); d2 = Util::CreateCleanString(v); // replace non printable characters by '.' - if( (long)GetLength() <= ValEntry::GetMaxSizePrintEntry() + if ( (long)GetLength() <= ValEntry::GetMaxSizePrintEntry() || PrintLevel >= 3 || d2.find(GDCM_NOTLOADED) < d2.length() ) { @@ -281,7 +281,7 @@ void ValEntry::Print(std::ostream &os, std::string const &) { if (v == "4294967295") // to avoid troubles in convertion { - st = Util::Format(" x(ffffffff)"); + st = "ffffffff"; } else { @@ -291,7 +291,7 @@ void ValEntry::Print(std::ostream &os, std::string const &) } else { - st = Util::Format(" "); + st = " "; } } s << st;