diff options
| author | Liang Qi <liang.qi@digia.com> | 2013-03-04 10:26:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-05 11:07:51 +0200 |
| commit | e77e64aff2134dd2f8884068fcf13a965b7c7b3f (patch) | |
| tree | b0eac082ecf16dd4a89d1eab19b718a7088e61d4 /src/3rdparty/libtiff/libtiff/tiffconf.h | |
| parent | 8b2b1b0f63d258ec5ea753cd44531731c0bdece8 (diff) | |
Upgrading libtiff: Patches to libtiff 4.0.3 for Qt usage
This is the collection of those earlier patches to libtiff in Qt that
are still relevant, updated as required. For details, refer to the git
history of the src/3rdparty/libtiff directory of Qt 4 and Qt
5/qtimageformats.
All defines which happened in tiffconf.h were commented in tif_config.h.
Done-with: aavit <eirik.aavitsland@digia.com>
Task-number: QTBUG-25409
Change-Id: I8dc43f0dfe47e6472c3475d9e60ee304dc54ee3b
Reviewed-by: aavit <eirik.aavitsland@digia.com>
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tiffconf.h')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tiffconf.h | 44 |
1 files changed, 34 insertions, 10 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tiffconf.h b/src/3rdparty/libtiff/libtiff/tiffconf.h index 1a01222..f37b0b5 100644 --- a/src/3rdparty/libtiff/libtiff/tiffconf.h +++ b/src/3rdparty/libtiff/libtiff/tiffconf.h @@ -9,6 +9,40 @@ #include <qglobal.h> +/* Signed 16-bit type */ +#define TIFF_INT16_T qint16 + +/* Signed 32-bit type */ +#define TIFF_INT32_T qint32 + +/* Signed 64-bit type */ +#define TIFF_INT64_T qint64 + +/* Signed 8-bit type */ +#define TIFF_INT8_T qint8 + +/* Unsigned 16-bit type */ +#define TIFF_UINT16_T quint16 + +/* Unsigned 32-bit type */ +#define TIFF_UINT32_T quint32 + +/* Unsigned 64-bit type */ +#define TIFF_UINT64_T quint64 + +/* Unsigned 8-bit type */ +#define TIFF_UINT8_T quint8 + +/* Signed size type */ +#if QT_POINTER_SIZE == 4 +#define TIFF_SSIZE_T qint32 +#else +#define TIFF_SSIZE_T qint64 +#endif + +/* Pointer difference type */ +#define TIFF_PTRDIFF_T ptrdiff_t + /* Define to 1 if the system has the type `int16'. */ /* #undef HAVE_INT16 */ @@ -18,16 +52,6 @@ /* Define to 1 if the system has the type `int8'. */ /* #undef HAVE_INT8 */ -/* The size of a `int', as computed by sizeof. */ -#define SIZEOF_INT 4 - -/* The size of a `long', as computed by sizeof. */ -#if (QT_POINTER_SIZE == 8) && !defined(Q_OS_WIN64) -#define SIZEOF_LONG 8 -#else -#define SIZEOF_LONG 4 -#endif - /* Compatibility stuff. */ /* Define as 0 or 1 according to the floating point format suported by the |