X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=a51dd6603d2920aaa065f09e2b47f81bc0a2c88d;hb=8e10ae94ea66aca5adf40e66521fba9c736628c4;hp=2d9f5f9e416114cbeec03d67fcd7fd55a32a82a4;hpb=93748f382dadb5c9240c4156ce7bbe9dcc8da44f;p=gdcm.git

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 2d9f5f9e..a51dd660 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/20 17:15:53 $
-  Version:   $Revision: 1.52 $
+  Date:      $Date: 2005/01/30 17:30:57 $
+  Version:   $Revision: 1.59 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -46,14 +46,22 @@
 
 //-----------------------------------------------------------------------------
 #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
 #endif
-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 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
 
@@ -89,7 +97,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)
@@ -115,12 +123,13 @@ GDCM_EXPORT extern const std::string GDCM_UNREAD;
 ///        a sequence, itself nested in the third item of a sequence is the
 ///        string e.g.
 ///            0004|1220/2#0008|0082/0#0008|0090
+///        Probabely useless stuff.
 typedef std::string TagKey;
 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
@@ -134,6 +143,7 @@ enum DicomDirType {
    DD_SERIE,
    DD_IMAGE
 };
+
 } //namespace gdcm
 //-----------------------------------------------------------------------------
 #endif