Fix mistypings

[gdcm.git] / src / gdcmVR.cxx

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 3a7cd29473d48716aacb5ad19daa503c165fb60a..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: 2006/08/18 18:34:57 $
-  Version:   $Revision: 1.54 $
+  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
@@ -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'
@@ -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)
@@ -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;
 }
@@ -167,21 +168,37 @@ 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();
+  return vr.find(key) != vr.end();
+#ifdef USECOMPLETELYUNTESTEDCODE
+  // 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[] =
-    "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQ";
+    "AEASATCSDADSDTFLFDISLOLTOBOWOLOFPNSHSLSQSSSTTMUIULUNUSUTRT";
 
-  int nbVal = 26;
+  //int nbVal = strlen(VRvalues)/2; // save CPU time.
+  int nbVal = 29;
+ 
   const char *pt = VRvalues;
   for (int i=0;i<nbVal;i++)
   {
-     if(tested[0] == *pt++)
-       if(tested[1] == *pt++)
-          return true;       
+     if(key[0] == *pt++) {
+       if(key[1] == *pt++) {
+          return true;
+       }
+     }  
+     else {
+        pt++;
+     }        
   }
   return false;
+#endif
 
 }
 #endif