BUG: There was two bombs at the same time. Guess what what I found them all

[gdcm.git] / src / gdcmVR.cxx

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 12370084c5d39d408fb226c2cc210acb751e21db..3fcb456cd0774173e51602ae22be8882d0a67ead 100644 (file)
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -1,5 +1,21 @@
-// gdcmVR.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmVR.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/07/02 13:55:28 $
+  Version:   $Revision: 1.15 $
+                                                                                
+  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.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include <fstream>
 
 #include <iostream>
@@ -60,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;
    }
@@ -73,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);
 }
@@ -85,7 +101,7 @@ int gdcmVR::Count(VRKey key)
  *          \ref gdcmVR::IsVROfGdcmStringRepresentable .
  * @param   tested value represenation to check for.
  */
-bool gdcmVR::IsVROfGdcmBinaryRepresentable(VRKey tested)
+bool gdcmVR::IsVROfGdcmBinaryRepresentable(gdcmVRKey tested)
 {
    if ( ! Count(tested) )
    {
@@ -108,7 +124,7 @@ bool gdcmVR::IsVROfGdcmBinaryRepresentable(VRKey tested)
  *          but NOT a \ref gdcmBinEntry.
  * @param   tested value represenation to check for.
  */
-bool gdcmVR::IsVROfGdcmStringRepresentable(VRKey tested)
+bool gdcmVR::IsVROfGdcmStringRepresentable(gdcmVRKey tested)
 {
    if ( ! Count(tested) )
    {
@@ -120,7 +136,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;
    }