X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmVR.h;h=8728d51b58a0068aee944087edb5823b13dde942;hb=e121096f8f6163784c257a1fa5e6740c4b334f1a;hp=118ad3d8bdec874378ecd5f17424de3007696da9;hpb=7456fe5d01a4cdcf3227ef46aa1b75a8ff970416;p=gdcm.git diff --git a/src/gdcmVR.h b/src/gdcmVR.h index 118ad3d8..8728d51b 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/09/06 15:36:03 $ - Version: $Revision: 1.19 $ + Date: $Date: 2005/10/20 14:45:11 $ + Version: $Revision: 1.23 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,6 +20,8 @@ #define GDCMVR_H #include "gdcmCommon.h" +#include "gdcmVRKey.h" + #include #include #include @@ -28,7 +30,6 @@ namespace gdcm { //----------------------------------------------------------------------------- -typedef std::string VRKey; typedef std::string VRAtr; /// Value Representation Hash Table typedef std::map VRHT; @@ -56,7 +57,14 @@ 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 bool IsValidVR(VRKey const &key) { return vr.find(key) != vr.end(); } +#endif + + unsigned short GetAtomicElementLength(VRKey const &tested); private: VRHT vr;