ENH: If possible move the stl include after the gdcm ones, to avoid vc warnings

[gdcm.git] / src / gdcmVR.cxx

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index bf12afe851d0a8db6bd585007fcf8e8211061e38..4cc07ea90e32e005e658d7ec3aff2bee6a5d2778 100644 (file)
--- 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/28 09:30:58 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2004/10/08 04:43:38 $
+  Version:   $Revision: 1.18 $
                                                                                 
   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
@@ -16,20 +16,19 @@
                                                                                 
 =========================================================================*/
 
-#include <fstream>
-
-#include <iostream>
-
 #include "gdcmVR.h"
 #include "gdcmUtil.h"
 #include "gdcmDictSet.h"
 #include "gdcmDebug.h"
 
+#include <fstream>
+#include <iostream>
+
 //-----------------------------------------------------------------------------
 /**
  * \brief Constructor
  */
-gdcmVR::gdcmVR(void) 
+gdcmVR::gdcmVR() 
 {
    std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_VR);
    std::ifstream from(filename.c_str());
@@ -41,14 +40,14 @@ gdcmVR::gdcmVR(void)
 
    while (!from.eof()) 
    {
-      eatwhite(from);
+      from >> std::ws; // used to be eatwhite(from);
       from.getline(buff, 1024, ' ');
       key = buff;
-      eatwhite(from);
+      from >> std::ws; // used to be eatwhite(from);
       from.getline(buff, 1024, ';');
       name = buff;
 
-      eatwhite(from);
+      from >> std::ws; // used to be eatwhite(from);
       from.getline(buff, 1024, '\n');
 
       if(key!="")
@@ -59,10 +58,12 @@ gdcmVR::gdcmVR(void)
    from.close();
 }
 
+//-----------------------------------------------------------------------------
 /**
  * \brief Destructor
  */
-gdcmVR::~gdcmVR() {
+gdcmVR::~gdcmVR()
+{
    vr.clear();
 }
 
@@ -76,7 +77,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,20 +90,27 @@ 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);
 }
 
+//-----------------------------------------------------------------------------
 /**
  * \brief   Simple predicate that checks wether the given argument
  *          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!");
@@ -118,14 +126,16 @@ bool gdcmVR::IsVROfGdcmBinaryRepresentable(VRKey tested)
    return true;
 }
 
+//-----------------------------------------------------------------------------
 /**
  * \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!");