From d8398f68ddfe8ec8812e7e02c854fb661997e36e Mon Sep 17 00:00:00 2001 From: jpr Date: Tue, 18 Sep 2007 15:53:25 +0000 Subject: [PATCH] Fix the still ifdef-disabled code --- src/gdcmVR.cxx | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx index 395ca981..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/17 12:16:01 $ - Version: $Revision: 1.60 $ + 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 @@ -171,21 +171,26 @@ 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