X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=2fb153918b4300c1ef995951ee0a0f423caa0cf4;hb=9ca4fd0ccbfea12ed7760856de3a8faf41625869;hp=c0db974c4436c34c3f748414735c6e6df9df8609;hpb=fd37aa842b5d31ca266b6bda8a77f3201d02338d;p=gdcm.git

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index c0db974c..2fb15391 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/09/27 08:39:05 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2005/01/06 20:03:26 $
+  Version:   $Revision: 1.44 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -45,39 +45,37 @@
 #endif //_MSC_VER
 
 //-----------------------------------------------------------------------------
-#ifdef __GNUC__
-#ifndef HAVE_NO_STDINT_H
+// ifdef for old gcc compiler
+#ifdef GDCM_NO_ANSI_STRING_STREAM
+#  include <strstream>
+#  define  ostringstream ostrstream
+# else
+#  include <sstream>
+#endif
+
+#include <string>
+#include <assert.h>
+
+#ifdef GDCM_HAVE_STDINT_H
 #include <stdint.h>   // For uint8_t uint16_t and uint32_t
 #else
-typedef  unsigned char  uint8_t;
-typedef  unsigned short uint16_t;
-typedef  unsigned int   uint32_t;
-#define UINT32_MAX    (4294967295U)
-#endif //HAVE_NO_STDINT_H
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+typedef  signed char    int8_t;
 #endif
-
-#ifdef _MSC_VER 
 typedef  unsigned char  uint8_t;
 typedef  unsigned short uint16_t;
 typedef  unsigned int   uint32_t;
 #define UINT32_MAX    (4294967295U)
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__BORLANDC__)
 #define GDCM_EXPORT __declspec( dllexport )
-#define getcwd _getcwd
 #else
 #define GDCM_EXPORT
 #endif
 
-// ifdef for old gcc / broken compiler
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
-
+namespace gdcm
+{
 
 // Centralize information about the gdcm dictionary in only one file:
 #ifndef PUB_DICT_PATH
@@ -89,16 +87,15 @@ typedef  unsigned int   uint32_t;
 #define DICT_TS           "dicomTS.dic"
 #define DICT_VR           "dicomVR.dic"
 
-#include <string>
-
-const std::string GDCM_UNFOUND   = "gdcm::Unfound";   /// MEMORY LEAK
+const std::string GDCM_UNKNOWN   = "gdcm::Unknown";
+const std::string GDCM_UNFOUND   = "gdcm::Unfound";
 const std::string GDCM_BINLOADED = "gdcm::Binary data loaded";
 const std::string GDCM_NOTLOADED = "gdcm::NotLoaded";
 const std::string GDCM_UNREAD    = "gdcm::UnRead";
 
-/// \brief gdcmTagKey is made to old an "universal" (as in URL, Universal
-///        Ressource Locator)  key to a gdcmDocEntry i.e. a dicom tag.
-///        A dicom tag allways 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 element, 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
@@ -113,26 +110,26 @@ const std::string GDCM_UNREAD    = "gdcm::UnRead";
 ///        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
 };
-
+} //namespace gdcm
 //-----------------------------------------------------------------------------
 #endif