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 c400af1489e6200db6120feb75d53fe0b650c765..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/09/10 18:54:39 $
-  Version:   $Revision: 1.16 $
+  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();
 }
 
@@ -94,6 +95,7 @@ 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 .
@@ -124,6 +126,7 @@ bool gdcmVR::IsVROfGdcmBinaryRepresentable(gdcmVRKey tested)
    return true;
 }
 
+//-----------------------------------------------------------------------------
 /**
  * \brief   Simple predicate that checks wether the given argument
  *          corresponds to the Value Representation of a \ref gdcmValEntry