* src/gdcmElValSet.cxx, gdcmFile.cxx: JPR bug fix, removal of

[gdcm.git] / src / gdcmCommon.h

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index ba376a4228e5d2468a886f483008c1b6c71fa402..131fceba3d18243b398c7c8a68dafabd2b92bc2b 100644 (file)
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -7,11 +7,16 @@
 #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 +26,17 @@ typedef  unsigned int   guint32;
 #endif
 
 #include <string>
-typedef string TagKey;
-typedef string TagName;
+
+typedef std::string TagKey;
+typedef std::string TagName;
+
+enum FileType {
+      Unknown = 0,
+      ExplicitVR,
+      ImplicitVR,
+      ACR,
+      ACR_LIBIDO
+};
+
 
 #endif