* remove compilation warnings

[gdcm.git] / src / gdcmVR.h

diff --git a/src/gdcmVR.h b/src/gdcmVR.h
index 8d18dfddfc5d35d934f0e167b8eafb36ff3eeeeb..1b4af5611dcc34ab95d61a7eb731bdbc991a54ba 100644 (file)
--- a/src/gdcmVR.h
+++ b/src/gdcmVR.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.h,v $
   Language:  C++
-  Date:      $Date: 2004/06/20 18:08:48 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2005/01/11 15:15: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
@@ -24,30 +24,39 @@
 #include <string>
 #include <iostream>
 
+namespace gdcm 
+{
+
 //-----------------------------------------------------------------------------
 typedef std::string VRKey;
 typedef std::string VRAtr;
-typedef std::map<VRKey, VRAtr> VRHT;    // Value Representation Hash Table
+/// Value Representation Hash Table
+typedef std::map<VRKey, VRAtr> VRHT;
 
 //-----------------------------------------------------------------------------
-/*
- * Container for dicom Value Representation Hash Table
+/**
+ * \brief Container for dicom Value Representation Hash Table
  * \note   This is a singleton
  */
-class GDCM_EXPORT gdcmVR 
+class GDCM_EXPORT VR 
 {
 public:
-   gdcmVR(void);
-   ~gdcmVR();
+   VR(void);
+   ~VR();
 
    void Print(std::ostream &os = std::cout);
-   int Count(VRKey key);
-   bool IsVROfGdcmBinaryRepresentable(VRKey);
-   bool IsVROfGdcmStringRepresentable(VRKey);
+
+   int Count(VRKey const &key);
+   bool IsVROfBinaryRepresentable(VRKey const &tested);
+   bool IsVROfStringRepresentable(VRKey const &tested);
+   bool IsVROfSequence(VRKey const &tested);
+
+   bool IsValidVR(VRKey const &key);
 
 private:
    VRHT vr;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif