X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=0af21208d3643698614776e408519bed1d07d5fb;hb=55ef2ceb72dedf6dccfadf8b06e52b3b4cf81f70;hp=ea48792d6961e1620a582a6d0002c915b6c2ce70;hpb=4e6834393e47fa42e6419f8151812fbb02e0e711;p=gdcm.git

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index ea48792d..0af21208 100644
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,8 +3,7 @@
 #ifndef GDCMCOMMON_H
 #define GDCMCOMMON_H
 
-//-----------------------------------------------------------------------------
-#define GDCM_DEBUG -1
+#include "gdcmConfigure.h"
 
 //-----------------------------------------------------------------------------
 //This is needed when compiling in debug mode
@@ -25,15 +24,19 @@
 // return type for 'identifier' is '' (ie; not a UDT or reference to UDT. Will
 // produce errors if applied using infix notation
 #pragma warning ( disable : 4284 )
+// 'type' : forcing value to bool 'true' or 'false' (performance warning)
+// //#pragma warning ( disable : 4800 )
 #endif //_MSC_VER
 
-// Mmmmmm !
-// It reminds me the formerly well known LibIDO's idproto.h
-
 //-----------------------------------------------------------------------------
 #ifdef __GNUC__
 #ifndef HAVE_NO_STDINT_H
+//#if defined __STDC_LIMIT_MACROS
+//#endif
 #include <stdint.h>
+//#ifdef UINT32_MAX
+//#error hehrehhehehehe2
+//#endif
 #define guint16 uint16_t
 #define guint32 uint32_t
 #define gint16  int16_t
@@ -41,8 +44,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
@@ -50,17 +53,37 @@ 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
 
 #ifdef _MSC_VER
 #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
+
+
+// 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";
@@ -70,15 +93,11 @@ typedef std::string TagName;
 
 enum FileType {
       Unknown = 0,
-      ExplicitVR,
+      ExplicitVR, // gdcmDicomDir is in this case
       ImplicitVR,
       ACR,
-      ACR_LIBIDO,
-      DICOMDIR
+      ACR_LIBIDO
 };
 
-//For now gdcm is not willing cmake, try to be more quiet
-//#cmakedefine GDCM_NO_ANSI_STRING_STREAM
-
 //-----------------------------------------------------------------------------
 #endif