Program: gdcm
Module: $RCSfile: gdcmCommon.h,v $
Language: C++
- Date: $Date: 2004/10/12 04:35:44 $
- Version: $Revision: 1.36 $
+ Date: $Date: 2005/01/05 15:38:28 $
+ Version: $Revision: 1.43 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#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
+#if defined(_MSC_VER) || defined(__BORLANDC__)
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
#endif
-
-#ifdef _MSC_VER
-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
-#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
#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";
ACR,
ACR_LIBIDO
};
-
+} //namespace gdcm
//-----------------------------------------------------------------------------
#endif