* Fix JPR compilation errors on MSVC.Net 2003

[gdcm.git] / src / gdcmVR.cxx

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index e50ccc1bdecda922c88dd8258926f8d1ee57087d..3e461697ba8c319de06d5007c58d3f486dcc807a 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: 2005/01/28 17:01:30 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2005/06/24 10:55:59 $
+  Version:   $Revision: 1.37 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,19 +26,23 @@
 
 namespace gdcm 
 {
+//-----------------------------------------------------------------------------
+/// \brief auto generated function, to fill up the 'Value Representation'
+///        Dictionnary, if relevant file is not found on user's disk
 void FillDefaultVRDict(VRHT &vr);
+
 //-----------------------------------------------------------------------------
+// Constructor / Destructor
 /**
  * \brief Constructor
  */
- 
 VR::VR() 
 {
    std::string filename = DictSet::BuildDictPath() + DICT_VR;
    std::ifstream from(filename.c_str());
-   if(!from)
+   if ( !from )
    {
-      gdcmVerboseMacro("Can't open dictionary" << filename.c_str());
+      gdcmWarningMacro("Can't open dictionary" << filename.c_str());
       FillDefaultVRDict(vr);
    }
    else
@@ -59,7 +63,7 @@ VR::VR()
          from >> std::ws;
          from.getline(buff, 1024, '\n');
    
-         if(key != "")
+         if ( key != "" )
          {
             vr[key] = name;
          }
@@ -68,7 +72,6 @@ VR::VR()
    }
 }
 
-//-----------------------------------------------------------------------------
 /**
  * \brief Destructor
  */
@@ -77,23 +80,6 @@ VR::~VR()
    vr.clear();
 }
 
-//-----------------------------------------------------------------------------
-// Print
-/**
- * \brief   Print all 
- * @param   os The output stream to be written to.
- */
-void VR::Print(std::ostream &os) 
-{
-   std::ostringstream s;
-
-   for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
-   {
-      s << "VR : " << it->first << " = " << it->second << std::endl;
-   }
-   os << s.str();
-}
-
 //-----------------------------------------------------------------------------
 // Public
 /**
@@ -105,7 +91,6 @@ int VR::Count(VRKey const &key)
    return vr.count(key);
 }
 
-//-----------------------------------------------------------------------------
 /**
  * \brief   Simple predicate that checks whether the given argument
  *          corresponds to the Value Representation of a \ref BinEntry .
@@ -175,5 +160,21 @@ bool VR::IsValidVR(VRKey const &key)
 // Private
 
 //-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief   Print all 
+ * @param   os The output stream to be written to.
+ */
+void VR::Print(std::ostream &os) 
+{
+   std::ostringstream s;
 
+   for (VRHT::iterator it = vr.begin(); it != vr.end(); ++it)
+   {
+      s << "VR : " << it->first << " = " << it->second << std::endl;
+   }
+   os << s.str();
+}
+
+//-----------------------------------------------------------------------------
 } // end namespace gdcm