X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=2313fe016ed0723e98e6bf3108bbdb1c9d3e8ddb;hb=c907ef7411a7ddef4192414a95fb7909798e5d02;hp=4de3dee09c7dba7d23ccd43f636c906261b91381;hpb=02b51b4b9f4dd1c2992cb454463f07f9d62fbb3f;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index 4de3dee0..2313fe01 100644 --- a/src/gdcmCommon.h +++ b/src/gdcmCommon.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmCommon.h,v $ Language: C++ - Date: $Date: 2004/10/08 08:41:04 $ - Version: $Revision: 1.35 $ + Date: $Date: 2005/01/22 22:21:19 $ + Version: $Revision: 1.56 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -45,41 +45,42 @@ #endif //_MSC_VER //----------------------------------------------------------------------------- -#ifdef __GNUC__ -#ifndef HAVE_NO_STDINT_H -#include // For uint8_t uint16_t and uint32_t +#ifdef CMAKE_HAVE_STDINT_H + #include #else -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -#define UINT32_MAX (4294967295U) -#endif //HAVE_NO_STDINT_H +#ifdef CMAKE_HAVE_INTTYPES_H + // Old system only have this + #include // For uint8_t uint16_t and uint32_t +#endif #endif -#ifdef _MSC_VER -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; +// Broken plateform do not respect C99 and do not provide those typedef +#if defined(_MSC_VER) || defined(__BORLANDC__) +typedef signed __int8 int8_t; +typedef signed __int16 int16_t; +typedef signed __int32 int32_t; +typedef signed __int64 int64_t; +typedef unsigned __int8 uint8_t; +typedef unsigned __int16 uint16_t; +typedef unsigned __int32 uint32_t; +typedef unsigned __int64 uint64_t; #define UINT32_MAX (4294967295U) #endif -#ifdef _MSC_VER -#define GDCM_EXPORT __declspec( dllexport ) -#define getcwd _getcwd +#if defined(_WIN32) && defined(BUILD_SHARED_LIBS) + #ifdef gdcm_EXPORTS + #define GDCM_EXPORT __declspec( dllexport ) + #else + #define GDCM_EXPORT __declspec( dllimport ) + #endif #else -#define GDCM_EXPORT + #define GDCM_EXPORT #endif -// ifdef for old gcc / broken compiler -#ifdef GDCM_NO_ANSI_STRING_STREAM -# include -# define ostringstream ostrstream -# else -# include -#endif +#include +namespace gdcm +{ // Centralize information about the gdcm dictionary in only one file: #ifndef PUB_DICT_PATH @@ -91,50 +92,58 @@ typedef unsigned int uint32_t; #define DICT_TS "dicomTS.dic" #define DICT_VR "dicomVR.dic" -#include - -const std::string GDCM_UNFOUND = "gdcm::Unfound"; /// MEMORY LEAK -const std::string GDCM_BINLOADED = "gdcm::Binary data loaded"; -const std::string GDCM_NOTLOADED = "gdcm::NotLoaded"; -const std::string GDCM_UNREAD = "gdcm::UnRead"; +GDCM_EXPORT extern const std::string GDCM_UNKNOWN; +GDCM_EXPORT extern const std::string GDCM_UNFOUND; +GDCM_EXPORT extern const std::string GDCM_BINLOADED; +GDCM_EXPORT extern const std::string GDCM_NOTLOADED; +GDCM_EXPORT extern const std::string GDCM_UNREAD; -/// \brief gdcmTagKey is made to hold an "universal" (as in URL, Universal -/// Ressource Locator) key to a gdcmDocEntry i.e. a dicom tag. -/// A dicom tag always has a group and an element, but a set of tags +/// \brief TagKey is made to hold an "universal" (as in URL, Universal +/// Ressource Locator) key to a DocEntry i.e. a dicom tag. +/// A dicom tag always has a group and an elem, but a set of tags /// embeded in various (optionally nested) sequences and sharing -/// the same group and element all share the same (group, element) -/// "identifier". Hence the (group, element) cannot be used as an +/// the same group and elem all share the same (group, elem) +/// "identifier". Hence the (group, elem) cannot be used as an /// identifier (in gdcm we shall refer to a "TagKey") of a tag. /// In order to construct a proper tag identifier (i.e. a key) we /// consider the following definition of a TagKey: /// - let Group, Element be the string representation of the -/// group and element dicom tag members, +/// group and elem dicom tag members, /// - let ItemNumber be the string representation of the integer /// index of the considered item number of a sequence, /// Let the key of a tag embeded in a sequence, noted SeqTag, be /// the form: /// /ItemNumber#Group|Element /// where "/", "#" and "|" are characters acting as separators. -/// Then the general form of a gdcmTagKey is given by: +/// Then the general form of a TagKey is given by: /// Group|Element[SeqTag] /// where [SeqTag] means NO or many instances of SeqTag. -/// Hence the gdcmTagKey of a tag not "leaving" in a sequence is the +/// Hence the TagKey of a tag not "leaving" in a sequence is the /// string e.g. /// 0028|1201 -/// but the gdcmTagKey of a tag "embeded" is the first item of +/// but the TagKey of a tag "embeded" is the first item of /// a sequence, itself nested in the third item of a sequence is the /// string e.g. /// 0004|1220/2#0008|0082/0#0008|0090 -typedef std::string gdcmTagKey; +typedef std::string TagKey; typedef std::string TagName; enum FileType { - gdcmUnknown = 0, - gdcmExplicitVR, // gdcmDicomDir is in this case - gdcmImplicitVR, - gdcmACR, - gdcmACR_LIBIDO + Unknown = 0, + ExplicitVR, // DicomDir is in this case + ImplicitVR, + ACR, + ACR_LIBIDO }; +enum DicomDirType { + DD_UNKNOWN = 0, + DD_META, + DD_PATIENT, + DD_STUDY, + DD_SERIE, + DD_IMAGE +}; +} //namespace gdcm //----------------------------------------------------------------------------- #endif