X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fgdcmjasper%2Fsrc%2Flibjasper%2Finclude%2Fjasper%2Fjas_config.h.in;h=cc57eed72926fd18985a6899b817894d4d505766;hb=1160ad545f6abeb4402a83b9e496552a26f50e3b;hp=f30a41992f02aace663fe3d8a12a89dc501a246c;hpb=c1611dd05898896cb9917a762d380198bae2ff6d;p=gdcm.git diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in index f30a4199..cc57eed7 100644 --- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in +++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in @@ -16,6 +16,10 @@ #undef DEBUG_OVERFLOW #endif +#if defined(_MSC_VER) && _MSC_VER < 1300 +# pragma warning ( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */ +#endif + /* Define to 1 if you have the header file. */ #cmakedefine HAVE_DLFCN_H @@ -100,31 +104,49 @@ /* Define to the version of this package. */ #define PACKAGE_VERSION "@JAS_VERSION@" -#if 0 +/* Size of fundamental data types. */ /* The size of a `int', as computed by sizeof. */ -#define SIZEOF_INT 4 +#define SIZEOF_INT @GDCM_SIZEOF_INT@ /* The size of a `long', as computed by sizeof. */ -#define SIZEOF_LONG 4 - -/* The size of a `long long', as computed by sizeof. */ -#define SIZEOF_LONG_LONG 8 +#define SIZEOF_LONG @GDCM_SIZEOF_LONG@ /* The size of a `short', as computed by sizeof. */ -#define SIZEOF_SHORT 2 +#define SIZEOF_SHORT @GDCM_SIZEOF_SHORT@ + +/* The size of a `char', as computed by sizeof. */ +#define SIZEOF_CHAR @GDCM_SIZEOF_CHAR@ +/* The size of a `double', as computed by sizeof. */ +#define SIZEOF_DOUBLE @GDCM_SIZEOF_DOUBLE@ + +/* The size of a `float', as computed by sizeof. */ +#define SIZEOF_FLOAT @GDCM_SIZEOF_FLOAT@ + +/* Could someone give me an example of plateform that have + * different size for unsigned types ?? */ /* The size of a `unsigned int', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_INT 4 +#define SIZEOF_UNSIGNED_INT @GDCM_SIZEOF_INT@ /* The size of a `unsigned long', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG 4 +#define SIZEOF_UNSIGNED_LONG @GDCM_SIZEOF_LONG@ + +/* The size of a `unsigned short', as computed by sizeof. */ +#define SIZEOF_UNSIGNED_SHORT @GDCM_SIZEOF_SHORT@ + + +/* Define size of long long and/or __int64 bit integer type only if the type + exists. */ +/* The size of a `long long', as computed by sizeof. */ +#cmakedefine GDCM_SIZEOF_LONG_LONG @GDCM_SIZEOF_LONG_LONG@ +#cmakedefine GDCM_SIZEOF___INT64 @GDCM_SIZEOF___INT64@ /* The size of a `unsigned long long', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_LONG_LONG 8 +#define SIZEOF_UNSIGNED_LONG_LONG @GDCM_SIZEOF_LONG_LONG@ + -/* The size of a `unsigned short', as computed by sizeof. */ -#define SIZEOF_UNSIGNED_SHORT 2 +#if 0 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 #endif @@ -146,57 +168,79 @@ if it is not supported. */ /* #undef inline */ -/* I have #define for types... */ -#if 0 -/* Define to `long long' if does not define. */ -#define longlong long long - -/* Define to `unsigned' if does not define. */ -/* #undef size_t */ +/* Whether types "long long" and "__int64" are enabled. If a type is + enabled then it is a unique fundamental type. */ +#cmakedefine GDCM_TYPE_USE_LONG_LONG +#cmakedefine GDCM_TYPE_USE___INT64 -/* Define to `int' if does not define. */ -/* #undef ssize_t */ +/* Some properties of the available types. */ +#cmakedefine GDCM_TYPE_SAME_LONG_AND___INT64 +#cmakedefine GDCM_TYPE_SAME_LONG_LONG_AND___INT64 +#cmakedefine GDCM_TYPE_CONVERT_UI64_TO_DOUBLE -/* Define to `unsigned char' if does not define. */ -#define uchar unsigned char -/* Define to `unsigned int' if does not define. */ -/* #undef uint */ +/* On win32 there is no long long therefore use __int64 instead */ -/* Define to `unsigned long' if does not define. */ -#define ulong unsigned long - -/* Define to `unsigned long long' if does not define. */ -#define ulonglong unsigned long long - -/* Define to `unsigned short' if does not define. */ -/* #undef ushort */ -#endif - -/* #ifndef HAVE_SYS_TYPES_H -#else +typedef unsigned short ushort; +typedef unsigned int uint; +typedef unsigned long ulong; +#ifdef GDCM_TYPE_USE___INT64 typedef unsigned char uchar; +typedef unsigned __int64 ulonglong; +typedef __int64 longlong; +#else +#error this is not supposed to happen please report your compiler +#endif /*GDCM_TYPE_USE___INT64*/ +#else +#cmakedefine HAVE_GDCM_SIZEOF_UINT +#cmakedefine HAVE_GDCM_SIZEOF_USHORT +#cmakedefine HAVE_GDCM_SIZEOF_ULONG + +#ifdef GDCM_TYPE_USE_LONG_LONG +#ifndef HAVE_GDCM_SIZEOF_USHORT typedef unsigned short ushort; +#endif +#ifndef HAVE_GDCM_SIZEOF_UINT typedef unsigned int uint; +#endif +#ifndef HAVE_GDCM_SIZEOF_ULONG typedef unsigned long ulong; -typedef long long longlong; +#endif +typedef unsigned char uchar; typedef unsigned long long ulonglong; -//#define ssize_t int +typedef long long longlong; +#else +typedef unsigned short ushort; +typedef unsigned int uint; +typedef unsigned long ulong; +typedef unsigned char uchar; +typedef unsigned __int64 ulonglong; +typedef __int64 longlong; +#endif /* GDCM_TYPE_USE_LONG_LONG */ +/* #define ssize_t int */ +#endif /* HAVE_SYS_TYPES_H */ + + +#cmakedefine JASPERSTATIC +#cmakedefine JASPERDLL + +/* a function referenced thru JASEXTERNs: */ +#if defined( _WIN32 ) && defined (JASPERDLL) +#define JASGLOBAL(type) __declspec(dllexport) type +#else +#define JASGLOBAL(type) type +#endif + +/* a reference to a JASGLOBAL function: */ +#if defined(_WIN32) && !defined(JASPERSTATIC) +#ifdef JASPERDLL +#define JASEXTERN(type) __declspec(dllexport) type +#else +#define JASEXTERN(type) __declspec(dllimport) type #endif -*/ - -/* Copied from gdcmCommon.h */ -/* hope it works ... */ -/* 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 unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; -#define UINT32_MAX (4294967295U) +#else +#define JASEXTERN(type) extern type #endif