X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmVR.cxx;h=19596be9470c2e6d39ec0f035cb533df61281a6d;hb=7280ce0786e804fdd054debc3f6af18da169ded9;hp=0ac11a47c5bd720f8632ef5953547b9a8bd2897a;hpb=c76f30a8634fc176bc372851c24c7164aa776051;p=gdcm.git diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx index 0ac11a47..19596be9 100644 --- a/src/gdcmVR.cxx +++ b/src/gdcmVR.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmVR.cxx,v $ Language: C++ - Date: $Date: 2006/07/06 16:57:06 $ - Version: $Revision: 1.50 $ + Date: $Date: 2007/06/22 10:02:48 $ + Version: $Revision: 1.56 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -25,7 +25,7 @@ #include #include -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- /// \brief auto generated function, to fill up the 'Value Representation' @@ -108,7 +108,6 @@ bool VR::IsVROfBinaryRepresentable(VRKey const &tested) */ bool VR::IsVROfStringRepresentable(VRKey const &tested) { - return tested == "AE" || tested == "AS" || tested == "CS" || @@ -168,9 +167,26 @@ unsigned short VR::GetAtomicElementLength(VRKey const &tested) // VS6 need a single implementation in the dll #if defined(_MSC_VER) && (_MSC_VER == 1200) /// \brief checks is a supposed-to-be VR is a 'legal' one. -bool VR::IsValidVR(VRKey const &key) +bool VR::IsValidVR(VRKey const &tested) { - return vr.find(key) != vr.end(); +// return vr.find(key) != vr.end(); + static const char VRvalues[] = + "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQ"; + + int nbVal = 26; + const char *pt = VRvalues; + for (int i=0;i