X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=2313fe016ed0723e98e6bf3108bbdb1c9d3e8ddb;hb=c907ef7411a7ddef4192414a95fb7909798e5d02;hp=ee2ef9ddd4691cc07496a88d57a71412596d038a;hpb=6ba98a3c21d34a1f26770c8281a920c2266fa0ec;p=gdcm.git

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index ee2ef9dd..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: 2005/01/09 00:13:26 $
-  Version:   $Revision: 1.46 $
+  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,22 +45,36 @@
 #endif //_MSC_VER
 
 //-----------------------------------------------------------------------------
-#ifdef GDCM_HAVE_STDINT_H
-#include <stdint.h>   // For uint8_t uint16_t and uint32_t
+#ifdef CMAKE_HAVE_STDINT_H
+   #include <stdint.h>
 #else
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-typedef  signed char    int8_t;
+#ifdef CMAKE_HAVE_INTTYPES_H
+   // Old system only have this
+   #include <inttypes.h>   // For uint8_t uint16_t and uint32_t
 #endif
-typedef  unsigned char  uint8_t;
-typedef  unsigned short uint16_t;
-typedef  unsigned int   uint32_t;
-#define UINT32_MAX    (4294967295U)
 #endif
 
+// Broken plateform do not respect C99 and do not provide those typedef
 #if defined(_MSC_VER) || defined(__BORLANDC__)
-#define GDCM_EXPORT __declspec( dllexport )
+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
+
+#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
 
 #include <string>
@@ -78,23 +92,23 @@ namespace gdcm
 #define DICT_TS           "dicomTS.dic"
 #define DICT_VR           "dicomVR.dic"
 
-extern const std::string GDCM_UNKNOWN;
-extern const std::string GDCM_UNFOUND;
-extern const std::string GDCM_BINLOADED;
-extern const std::string GDCM_NOTLOADED;
-extern const std::string 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 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 element, but a set of tags
+///        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
@@ -121,6 +135,15 @@ enum FileType {
    ACR,
    ACR_LIBIDO
 };
+
+enum DicomDirType {
+   DD_UNKNOWN = 0,
+   DD_META,
+   DD_PATIENT,
+   DD_STUDY,
+   DD_SERIE,
+   DD_IMAGE
+};
 } //namespace gdcm
 //-----------------------------------------------------------------------------
 #endif