X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.cxx;h=596ac9ee37a958771c2c8958ca9983ae55755f46;hb=8ac4df8c7543a827c7b89fc9bbcf86625f3c1afe;hp=dbe4d2d5f109ccd79e5afc26bce7f7b0d74ea5c4;hpb=2012716d624d631dcdb825fdd4470908e115a717;p=gdcm.git

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index dbe4d2d5..596ac9ee 100644
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/20 18:08:48 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2004/09/27 08:39:08 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -76,7 +76,7 @@ void gdcmVR::Print(std::ostream &os)
 {
    std::ostringstream s;
 
-   for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
+   for (gdcmVRHT::iterator it = vr.begin(); it != vr.end(); ++it)
    {
       s << "VR : "<<it->first<<" = "<<it->second<<std::endl;
    }
@@ -89,7 +89,7 @@ void gdcmVR::Print(std::ostream &os)
  * \brief   Get the count for an element
  * @param   key key to count
  */
-int gdcmVR::Count(VRKey key) 
+int gdcmVR::Count(gdcmVRKey key) 
 {
    return vr.count(key);
 }
@@ -99,10 +99,16 @@ int gdcmVR::Count(VRKey key)
  *          corresponds to the Value Representation of a \ref gdcmBinEntry .
  *          This predicate is the negation of
  *          \ref gdcmVR::IsVROfGdcmStringRepresentable .
- * @param   tested value represenation to check for.
+ * @param   tested value representation to check for.
  */
-bool gdcmVR::IsVROfGdcmBinaryRepresentable(VRKey tested)
+bool gdcmVR::IsVROfGdcmBinaryRepresentable(gdcmVRKey tested)
 {
+   //std::cout << "gdcmVR::IsVROfGdcmBinaryRepresentable===================="
+   //   << tested << std::endl;
+
+   if ( tested == "unkn")
+      return true;
+
    if ( ! Count(tested) )
    {
       dbg.Verbose(0, "gdcmVR::IsVROfGdcmBinaryRepresentable: tested not a VR!");
@@ -122,10 +128,11 @@ bool gdcmVR::IsVROfGdcmBinaryRepresentable(VRKey tested)
  * \brief   Simple predicate that checks wether the given argument
  *          corresponds to the Value Representation of a \ref gdcmValEntry
  *          but NOT a \ref gdcmBinEntry.
- * @param   tested value represenation to check for.
+ * @param   tested value representation to check for.
  */
-bool gdcmVR::IsVROfGdcmStringRepresentable(VRKey tested)
+bool gdcmVR::IsVROfGdcmStringRepresentable(gdcmVRKey tested)
 {
+
    if ( ! Count(tested) )
    {
       dbg.Verbose(0, "gdcmVR::IsVROfGdcmStringRepresentable: tested not a VR!");
@@ -136,7 +143,7 @@ bool gdcmVR::IsVROfGdcmStringRepresentable(VRKey tested)
        tested == "UI" || tested == "TM" || tested == "SH" || tested == "LO" ||
        tested == "CS" || tested == "IS" || tested == "LO" || tested == "LT" ||
        tested == "SH" || tested == "ST" || tested == "DS" || tested == "SL" ||
-       tested == "SS" || tested == "UL" || tested == "US" )
+       tested == "SS" || tested == "UL" || tested == "US" || tested == "UN")
    {
       return true;
    }