X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=be09ff3c0ec27f385f0069a17ff3e5e3ff448d30;hb=fbd2698cb0545343abc2d8aefe92bab1f5b3eaa3;hp=d32319f029421a36e4481214564c5ecfc941424f;hpb=e30e614e7f63b52306d85040068e2205a9e6327a;p=gdcm.git

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index d32319f0..be09ff3c 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/21 19:51:12 $
-  Version:   $Revision: 1.53 $
+  Date:      $Date: 2005/07/02 19:19:57 $
+  Version:   $Revision: 1.68 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,6 +27,8 @@
 // 'identifier' : class 'type' needs to have dll-interface to be used by
 // clients of class 'type2'
 #pragma warning ( disable : 4251 )
+// non dll-interface class 'type' used as base for dll-interface class 'type2'
+#pragma warning ( disable : 4275 )
 // 'identifier' : identifier was truncated to 'number' characters in the
 // debug information
 #pragma warning ( disable : 4786 )
@@ -46,15 +48,23 @@
 
 //-----------------------------------------------------------------------------
 #ifdef CMAKE_HAVE_STDINT_H
-#include <stdint.h>   // For uint8_t uint16_t and uint32_t
+   #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;
-typedef  unsigned long  uint64_t;
+#endif
+
+// Broken plateform do not respect C99 and do not provide those typedef
+// Special case for recent borland compiler, comes with stdint.h
+#if defined(_MSC_VER) || defined(__BORLANDC__) && (__BORLANDC__ < 0x0560)  || defined(__MINGW32__)
+typedef  signed char         int8_t;
+typedef  signed short        int16_t;
+typedef  signed int          int32_t;
+typedef  unsigned char       uint8_t;
+typedef  unsigned short      uint16_t;
+typedef  unsigned int        uint32_t;
 #define UINT32_MAX    (4294967295U)
 #endif
 
@@ -70,6 +80,7 @@ typedef  unsigned long  uint64_t;
 
 #include <string>
 
+/// \brief namespace for Grass root DiCoM
 namespace gdcm
 {
 
@@ -78,10 +89,11 @@ namespace gdcm
 #  define PUB_DICT_PATH   "../Dicts/"
 #endif
 #define PUB_DICT_NAME     "DicomV3Dict"
-#define PUB_DICT_FILENAME "dicomV3.dic"
+#define PUB_DICT_FILENAME "gdcm.dic"
 #define DICT_ELEM         "DicomDir.dic"
 #define DICT_TS           "dicomTS.dic"
 #define DICT_VR           "dicomVR.dic"
+#define DICT_GROUP_NAME   "DictGroupName.dic"
 
 GDCM_EXPORT extern const std::string GDCM_UNKNOWN;
 GDCM_EXPORT extern const std::string GDCM_UNFOUND;
@@ -90,7 +102,7 @@ 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.
+///        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 elem all share the same (group, elem)
@@ -121,12 +133,13 @@ typedef std::string TagName;
 
 enum FileType {
    Unknown = 0,
-   ExplicitVR, // DicomDir is in this case
+   ExplicitVR, // DicomDir is in this case. Except when it's ImplicitVR !...
    ImplicitVR,
    ACR,
    ACR_LIBIDO
 };
 
+/// \brief type of the elements composing a DICOMDIR (for internal use only)
 enum DicomDirType {
    DD_UNKNOWN = 0,
    DD_META,
@@ -135,6 +148,20 @@ enum DicomDirType {
    DD_SERIE,
    DD_IMAGE
 };
+
+/**
+ * \brief structure, for internal use only
+ */  
+struct Element
+{
+   /// DicomGroup number
+   unsigned short int Group;
+   /// DicomElement number
+   unsigned short int Elem;
+   /// value (coded as a std::string) of the Element
+   std::string Value;
+};
+
 } //namespace gdcm
 //-----------------------------------------------------------------------------
 #endif