X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmValEntry.cxx;h=671e6bd381f4d198301f51dfb4aae666beb25add;hb=34e322ceb4e12797e6d4cb1e691a36425015d2e0;hp=9359185d56d530405ba3954d88893fc2cea0cc8d;hpb=4362b8f0545aa491dcf5295ad96d910aac169462;p=gdcm.git diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx index 9359185d..671e6bd3 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/06/07 10:07:20 $ - Version: $Revision: 1.61 $ + Date: $Date: 2005/07/05 14:55:24 $ + Version: $Revision: 1.63 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -25,6 +25,8 @@ #include "gdcmDocument.h" #include +#include // for isdigit +#include // for atoi namespace gdcm { @@ -146,13 +148,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 +216,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() ) {