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 3a7cd29473d48716aacb5ad19daa503c165fb60a..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/08/18 18:34:57 $
-  Version:   $Revision: 1.54 $
+  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'
@@ -177,9 +177,13 @@ bool VR::IsValidVR(VRKey const &tested)
   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;