X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=786c053a3035279f6a55300560c0dc3714a4ae52;hb=0bcc188c6d5185375f809253e8b9b97c856d2eac;hp=b738823ef4d47a251cf6ca78e8a44819179d1c02;hpb=292cdd36a9dd401957aebcd1765c424066134f25;p=gdcm.git diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx index b738823e..786c053a 100644 --- a/src/gdcmVR.cxx +++ b/src/gdcmVR.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmVR.cxx,v $ Language: C++ - Date: $Date: 2007/09/14 20:40:44 $ - Version: $Revision: 1.58 $ + Date: $Date: 2007/09/18 15:53:25 $ + Version: $Revision: 1.61 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -86,7 +86,7 @@ VR::~VR() /** * \brief Simple predicate that checks whether the given argument - * corresponds to the Value Representation of a \ref DataEntry . + * corresponds to the Value Representation of a DataEntry . * @param tested value representation to check for. */ bool VR::IsVROfBinaryRepresentable(VRKey const &tested) @@ -167,25 +167,30 @@ 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 &tested) +bool VR::IsValidVR(VRKey const &key) { return vr.find(key) != vr.end(); #ifdef USECOMPLETELYUNTESTEDCODE -// "RT" is an undocumented VR, found in some Siemens images. -// We added it here to be able to read these images. -// Dict/gdcmVR.dic has to be updated, too. + // to avoid to search in a std::map of std::string, + // since each std::string is 2 characters longs, we check the array + // (29 char comparisons in the worst case!) + + // "RT" is an undocumented VR, found in some Siemens images. + // We added it here to be able to read these images. + // Dict/gdcmVR.dic, Document has to be updated, too. static const char VRvalues[] = - "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQRT"; + "AEASATCSDADSDTFLFDISLOLTOBOWOFPNSHSLSQSSSTTMUIULUNUSUTRT"; //int nbVal = strlen(VRvalues)/2; // save CPU time. - int nbVal = 27; - + int nbVal = 28; + const char *pt = VRvalues; for (int i=0;i