X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=ed76f8af7a111fc1cb77795cc114732704c3a281;hb=1fe405b2347a5f78d5ecc67d2d81f53bd9c7541d;hp=c5cbc8dc01a8b8a7aaa21cd6523bceabd50a3c71;hpb=b21d001c8abe8aec991946adfd4c899500122304;p=gdcm.git diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h index c5cbc8dc..ed76f8af 100644 --- a/src/gdcmCommon.h +++ b/src/gdcmCommon.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmCommon.h,v $ Language: C++ - Date: $Date: 2005/01/20 11:39:49 $ - Version: $Revision: 1.51 $ + Date: $Date: 2005/01/23 01:00:17 $ + Version: $Revision: 1.57 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -46,14 +46,24 @@ //----------------------------------------------------------------------------- #ifdef CMAKE_HAVE_STDINT_H -#include // For uint8_t uint16_t and uint32_t + #include #else -#if defined(_MSC_VER) || defined(__BORLANDC__) -typedef signed char int8_t; +#ifdef CMAKE_HAVE_INTTYPES_H + // Old system only have this + #include // For uint8_t uint16_t and uint32_t +#endif #endif -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; + +// Broken plateform do not respect C99 and do not provide those typedef +#if defined(_MSC_VER) || defined(__BORLANDC__) +typedef signed char int8_t; +typedef signed short int16_t; +typedef signed int int32_t; +typedef signed __int64 int64_t; +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +typedef unsigned __int64 uint64_t; #define UINT32_MAX (4294967295U) #endif @@ -125,6 +135,15 @@ enum FileType { ACR, ACR_LIBIDO }; + +enum DicomDirType { + DD_UNKNOWN = 0, + DD_META, + DD_PATIENT, + DD_STUDY, + DD_SERIE, + DD_IMAGE +}; } //namespace gdcm //----------------------------------------------------------------------------- #endif