X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmVR.h;h=b08a5ba4bf3ecf1a131cbb260d967526bcae32b4;hb=57ec56658548c34052a1c1678ffcb6907c3faeec;hp=f3fca668413ae4f1569a2f28dea52421791ed4de;hpb=1d9ac5cec02b9daa18b16835882b531731b125ad;p=gdcm.git

diff --git a/src/gdcmVR.h b/src/gdcmVR.h
index f3fca668..b08a5ba4 100644
--- a/src/gdcmVR.h
+++ b/src/gdcmVR.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmVR.h,v $
   Language:  C++
-  Date:      $Date: 2005/10/18 12:58:29 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2005/11/29 17:10:12 $
+  Version:   $Revision: 1.29 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,7 +19,7 @@
 #ifndef GDCMVR_H
 #define GDCMVR_H
 
-#include "gdcmCommon.h"
+#include "gdcmRefCounter.h"
 #include "gdcmVRKey.h"
 
 #include <map>
@@ -39,13 +39,15 @@ typedef std::map<VRKey, VRAtr> VRHT;
  * \brief Container for dicom Value Representation Hash Table
  * \note   This is a singleton
  */
-class GDCM_EXPORT VR 
+class GDCM_EXPORT VR : public RefCounter
 {
+   gdcmTypeMacro(VR);
+
 public:
-   VR(void);
-   ~VR();
+   static VR *New() {return new VR();}
 
-   void Print(std::ostream &os = std::cout);
+   virtual void Print(std::ostream &os = std::cout, 
+                      std::string const & = "" );
 
    /// \brief   Get the count for an element
    int Count(VRKey const &key) { return vr.count(key); };
@@ -57,9 +59,19 @@ public:
    ///          corresponds to the Value Representation of a \ref SeqEntry
    bool IsVROfSequence(VRKey const &tested) { return tested == "SQ"; }
 
+// Remove inline optimization for VS6
+#if defined(_MSC_VER) && (_MSC_VER == 1200)
+   bool IsValidVR(VRKey const &key);
+#else
+/// \brief checks if a supposed-to-be VR is a 'legal' one.
    bool IsValidVR(VRKey const &key) { return vr.find(key) != vr.end(); }
+#endif
 
-   unsigned short GetAtomicElementLength(VRKey const &vr);
+   unsigned short GetAtomicElementLength(VRKey const &tested);
+
+protected:
+   VR();
+   ~VR();
 
 private:
    VRHT vr;