X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=d68b915536925c7224bd9c41f7502f854e66c9eb;hb=4f0dd702736cecd2fa0b27bedf2118231468f226;hp=0bac8c4f52a2932feb80fc3ae68ae8f339224a00;hpb=aefb6795ff05e125ff5b90b70d9748f5bd545a48;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 0bac8c4f..d68b9155 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/08/18 16:10:48 $
-  Version:   $Revision: 1.53 $
+  Date:      $Date: 2007/09/15 11:13:37 $
+  Version:   $Revision: 1.59 $
                                                                                 
   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 <iostream>
 #include <string.h>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 /// \brief auto generated function, to fill up the 'Value Representation'
@@ -167,21 +167,32 @@ 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();
-  static char *VRvalues =
-    "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQ";
-
-  int nbVal=26;
-  char *pt = VRvalues;
+  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.
+  static const char VRvalues[] =
+    "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQRT";
+
+  //int nbVal = strlen(VRvalues)/2; // save CPU time.
+  int nbVal = 27;
+  
+  const char *pt = VRvalues;
   for (int i=0;i<nbVal;i++)
   {
-     if(tested[0] == *pt++)
+     if(tested[0] == *pt++) {
        if(tested[1] == *pt++)
-          return true;       
+          return true;
+     }  
+     else {
+        pt++;
+     }        
   }
   return false;
+#endif
 
 }
 #endif