X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=4f9d4ece6adbef1bb35868e646747e3c20ef1517;hb=801fe2221ca70b34c5c644b6f522aa1b7233945b;hp=173fba77914867722a5dfe28a327aa18c2aad314;hpb=81e328d78c2028a7c2ecb86e6cee04839f4d56b2;p=gdcm.git

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 173fba77..4f9d4ece 100644
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,6 +3,8 @@
 #ifndef GDCMCOMMON_H
 #define GDCMCOMMON_H
 
+#include "gdcmConfigure.h"
+
 //-----------------------------------------------------------------------------
 //This is needed when compiling in debug mode
 #ifdef _MSC_VER
@@ -37,8 +39,8 @@
 #else
 typedef  unsigned short guint16;
 typedef  unsigned int   guint32;
-typedef  short 		gint16;
-typedef  int   		gint32;
+typedef  short          gint16;
+typedef  int   	        gint32;
 #define UINT32_MAX    (4294967295U)
 #endif //HAVE_NO_STDINT_H
 #endif
@@ -46,8 +48,8 @@ typedef  int   		gint32;
 #ifdef _MSC_VER 
 typedef  unsigned short guint16;
 typedef  unsigned int   guint32;
-typedef  short 		gint16;
-typedef  int   		gint32;
+typedef  short 	        gint16;
+typedef  int            gint32;
 #define UINT32_MAX    (4294967295U)
 #endif
 
@@ -58,6 +60,25 @@ typedef  int   		gint32;
 #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
+
+
+// Centralize information about the gdcm dictionary in only one file:
+#ifndef PUB_DICT_PATH
+#  define PUB_DICT_PATH   "../Dicts/"
+#endif
+#define PUB_DICT_NAME     "DicomV3Dict"
+#define PUB_DICT_FILENAME "dicomV3.dic"
+#define DICT_ELEM         "DicomDir.dic"
+#define DICT_TS           "dicomTS.dic"
+#define DICT_VR           "dicomVR.dic"
+
 #include <string>
 
 const std::string GDCM_UNFOUND = "gdcm::Unfound";
@@ -66,15 +87,12 @@ typedef std::string TagKey;
 typedef std::string TagName;
 
 enum FileType {
-      Unknown = 0,
-      ExplicitVR, // gdcmDicomDir are in this case
-      ImplicitVR,
-      ACR,
-      ACR_LIBIDO
+      gdcmUnknown = 0,
+      gdcmExplicitVR, // gdcmDicomDir is in this case
+      gdcmImplicitVR,
+      gdcmACR,
+      gdcmACR_LIBIDO
 };
 
-//For now gdcm is not willing cmake, try to be more quiet
-//#cmakedefine GDCM_NO_ANSI_STRING_STREAM
-
 //-----------------------------------------------------------------------------
 #endif