Fix mistypings

[gdcm.git] / src / gdcmVR.cxx

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 395ca981ae8459c3becc99e789b50041fb0917a6..ded62a4a6172c9511246f184b8b8780fcb607ac3 100644 (file)
--- 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: 2008/02/13 11:42:13 $
+  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
@@ -113,6 +113,7 @@ bool VR::IsVROfStringRepresentable(VRKey const &tested)
           tested == "CS" ||
           tested == "DA" ||
           tested == "DS" ||
+          tested == "DT" || 
           tested == "FL" ||
           tested == "FD" ||
           tested == "IS" || 
@@ -159,7 +160,7 @@ unsigned short VR::GetAtomicElementLength(VRKey const &tested)
    if( tested == "OW" )
       return 2;
    // Float string
-   if( tested == "OF" )
+   if( tested == "OF" || tested == "OL")
       return 4;   
    return 1;
 }
@@ -171,21 +172,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";
+    "AEASATCSDADSDTFLFDISLOLTOBOWOLOFPNSHSLSQSSSTTMUIULUNUSUTRT";
 
   //int nbVal = strlen(VRvalues)/2; // save CPU time.
-  int nbVal = 27;
-  
+  int nbVal = 29;
+ 
   const char *pt = VRvalues;
   for (int i=0;i<nbVal;i++)
   {
-     if(tested[0] == *pt++) {
-       if(tested[1] == *pt++)
+     if(key[0] == *pt++) {
+       if(key[1] == *pt++) {
           return true;
+       }
      }  
      else {
         pt++;