* Fix :Oops ! Forgot to commit gdcmFile::GetImageDataSizeRaw();

[gdcm.git] / src / gdcmCommon.h

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index ba376a4228e5d2468a886f483008c1b6c71fa402..326c44ad204fb86fd98c7ed3d53630fd4f3f2f44 100644 (file)
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,15 +3,40 @@
 #ifndef GDCMCOMMON_H
 #define GDCMCOMMON_H
 
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+//'identifier' : decorated name length exceeded, name was truncated
+#pragma warning ( disable : 4503 )
+// C++ exception specification ignored except to indicate a 
+// function is not __declspec(nothrow)
+#pragma warning ( disable : 4290 )
+// signed/unsigned mismatch
+#pragma warning ( disable : 4018 )
+// 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 )
+#endif //_MSC_VER
+
 #ifdef __GNUC__
 #include <stdint.h>
 #define guint16 uint16_t
 #define guint32 uint32_t
+#define gint16  int16_t
+#define gint32  int32_t
 #endif
 
 #ifdef _MSC_VER 
 typedef  unsigned short guint16;
 typedef  unsigned int   guint32;
+typedef  short                 gint16;
+typedef  int                   gint32;
+#define UINT32_MAX    (4294967295U)
 #endif
 
 #ifdef _MSC_VER
@@ -21,7 +46,19 @@ typedef  unsigned int   guint32;
 #endif
 
 #include <string>
-typedef string TagKey;
-typedef string TagName;
+
+const std::string GDCM_UNFOUND = "gdcm::Unfound";
+
+typedef std::string TagKey;
+typedef std::string TagName;
+
+enum FileType {
+      Unknown = 0,
+      ExplicitVR,
+      ImplicitVR,
+      ACR,
+      ACR_LIBIDO
+};
+
 
 #endif