Win32 sux ! --- Frog

[gdcm.git] / src / gdcm.h

diff --git a/src/gdcm.h b/src/gdcm.h
index 22f3eb9e7044877b912090b28ae43bf0a16f9217..f0b4b91aa624982f0a34f3439a692348f3783a0b 100644 (file)
--- a/src/gdcm.h
+++ b/src/gdcm.h
@@ -28,15 +28,19 @@
                       // 3/ Make sure we can setup some default size value,
                       //    which should be around 4500 entries which is the
                       //    average dictionary size (said JPR)
+
+#define g_malloc malloc
+#define g_free   free
+
 #ifdef __GNUC__
 #include <stdint.h>
 #define guint16 uint16_t
 #define guint32 uint32_t
-#define g_malloc malloc
-#define g_free   free
 #endif
-#ifdef _MSC_VER
-#include <glib.h>
+#ifdef _MSC_VER 
+typedef  unsigned short guint16;
+typedef  unsigned int guint32;
+
 #endif
 
 #ifdef _MSC_VER
@@ -186,7 +190,7 @@ typedef map<TagKey, ElValue*> TagElValueHT;
 typedef map<string, ElValue*> TagElValueNameHT;
 // Container for a set of succefully parsed ElValues.
 class GDCM_EXPORT ElValSet {
-       // We need both accesses with a TagKey and the Dicentry.Name
+       // We need both accesses with a TagKey and the Dictentry.Name
        TagElValueHT tagHt;
        TagElValueNameHT NameHt;
 public:
@@ -220,6 +224,7 @@ class GDCM_EXPORT gdcmHeader {
                //BadLittleEndian,
                //BigEndian, 
                //BadBigEndian};
+       void SkipBytes(guint32);
 private:
        // All instances share the same Value Representation dictionary
        static VRHT *dicom_vr;
@@ -254,6 +259,7 @@ private:
        void Initialise(void);
        void CheckSwap(void);
        void FindLength(ElValue *);
+       guint32 FindLengthOB(void);
        void FindVR(ElValue *);
        void LoadElementValue(ElValue *);
        void LoadElementValueSafe(ElValue *);