X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.h;h=80d6a3406b34a333e06d06fc59a95c2ebd8be632;hb=bd7bec4c367d671a9da358584e98a8ec29bb641e;hp=745797a2b7d040929d333d841323e059b4649da8;hpb=46afb30d2d016a9b1581c7ee4ca96d614a35203c;p=gdcm.git diff --git a/src/gdcmVR.h b/src/gdcmVR.h index 745797a2..80d6a340 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/11/28 15:20:34 $ - Version: $Revision: 1.27 $ + Date: $Date: 2007/09/17 12:16:01 $ + Version: $Revision: 1.34 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -16,17 +16,17 @@ =========================================================================*/ -#ifndef GDCMVR_H -#define GDCMVR_H +#ifndef _GDCMVR_H_ +#define _GDCMVR_H_ -#include "gdcmCommandManager.h" +#include "gdcmRefCounter.h" #include "gdcmVRKey.h" #include #include #include -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- @@ -39,7 +39,7 @@ typedef std::map VRHT; * \brief Container for dicom Value Representation Hash Table * \note This is a singleton */ -class GDCM_EXPORT VR : public CommandManager +class GDCM_EXPORT VR : public RefCounter { gdcmTypeMacro(VR); @@ -47,7 +47,7 @@ public: static VR *New() {return new VR();} virtual void Print(std::ostream &os = std::cout, - std::string const &indent = "" ); + std::string const & = "" ); /// \brief Get the count for an element int Count(VRKey const &key) { return vr.count(key); }; @@ -56,14 +56,14 @@ public: bool IsVROfStringRepresentable(VRKey const &tested); /// \brief Simple predicate that checks whether the given argument - /// corresponds to the Value Representation of a \ref SeqEntry + /// corresponds to the Value Representation of a 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 is a supposed-to-be VR is a 'legal' one. +/// \brief checks if a supposed-to-be VR is a 'legal' one. bool IsValidVR(VRKey const &key) { return vr.find(key) != vr.end(); } #endif