X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=f243d8421bd2bb09dedd3441cadd6822cd6d8760;hb=ee65673385a2d6192d7d64ed0339bd47515de805;hp=ba376a4228e5d2468a886f483008c1b6c71fa402;hpb=565a47ec4e037897aaf770aeccc5d67d7ad7b478;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index ba376a42..f243d842 100644 --- a/src/gdcmCommon.h +++ b/src/gdcmCommon.h @@ -7,11 +7,16 @@ #include #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,20 @@ typedef unsigned int guint32; #endif #include +#ifdef _MSC_VER +using namespace std; // string type lives in the std namespace on VC++ +#endif + typedef string TagKey; typedef string TagName; +enum FileType { + Unknown = 0, + ExplicitVR, + ImplicitVR, + ACR, + ACR_LIBIDO +}; // CLEANME + + #endif