Solve (hope so!) the JPEG troubles when BitsStored == 8 && BitsAllocated==16

[gdcm.git] / src / gdcmVR.cxx

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index f553919142c66e4467eb75fb05e8892580294706..19596be9470c2e6d39ec0f035cb533df61281a6d 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/07/10 08:27:27 $
-  Version:   $Revision: 1.51 $
+  Date:      $Date: 2007/06/22 10:02:48 $
+  Version:   $Revision: 1.56 $
                                                                                 
   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'
@@ -71,7 +71,6 @@ VR::VR()
       }
       from.close();
    }
-   char *VRvalues = "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQ";
 }
 
 /**
@@ -168,17 +167,23 @@ 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 &key)
+bool VR::IsValidVR(VRKey const &tested)
 {
 //  return vr.find(key) != vr.end();
+  static const char VRvalues[] =
+    "AEASCSDADSFLFDISLOLTPNSHSLSSSTTMUIULUSUTOBOWOFATUNSQ";
 
-  int nbVal=26;
-  char *pt = VRvalues;
+  int nbVal = 26;
+  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;