gdcmFile::GetImageDataIntoVector now

[gdcm.git] / src / gdcmCommon.h

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index 4545807082ff3c85042afb8d4b25f8b97f22a740..cc80d9e9e7cf87a04170d965ab7e74f1d733116c 100644 (file)
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,6 +3,18 @@
 #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 )
+#endif //_MSC_VER
+
 #ifdef __GNUC__
 #include <stdint.h>
 #define guint16 uint16_t
@@ -16,17 +28,29 @@ typedef  unsigned short guint16;
 typedef  unsigned int   guint32;
 typedef  short                 gint16;
 typedef  int                   gint32;
+#define UINT32_MAX    (4294967295U)
 #endif
 
 #ifdef _MSC_VER
 #define GDCM_EXPORT __declspec( dllexport )
-using namespace std;
 #else
 #define GDCM_EXPORT
 #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