diff options
| author | Bernhard Rosenkraenzer <bero@arklinux.ch> | 2009-10-05 10:08:24 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-10-05 10:09:14 (GMT) |
| commit | 7ec805adeecb8d518c0eb01dad1c04ccea78b340 (patch) | |
| tree | ee59049491cd11384914235e63980ba6ad9c492d | |
| parent | e548c48513546199c848e6cb08a60e8eccdab2c5 (diff) | |
| download | Qt-7ec805adeecb8d518c0eb01dad1c04ccea78b340.zip Qt-7ec805adeecb8d518c0eb01dad1c04ccea78b340.tar.gz Qt-7ec805adeecb8d518c0eb01dad1c04ccea78b340.tar.bz2 | |
Adapt to libtiff 4.0 changes
In libtiff 4.0, TIFF_VERSION has been replaced with
TIFF_VERSION_CLASSIC (to indicate normal tiff support)
and
TIFF_VERSION_BIG (to indicate BigTIFF support)
Merge-request: 1547
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| -rw-r--r-- | config.tests/unix/libtiff/libtiff.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config.tests/unix/libtiff/libtiff.cpp b/config.tests/unix/libtiff/libtiff.cpp index 2d4b2af..7d41f25 100644 --- a/config.tests/unix/libtiff/libtiff.cpp +++ b/config.tests/unix/libtiff/libtiff.cpp @@ -41,6 +41,11 @@ #include <tiffio.h> +#if !defined(TIFF_VERSION) && defined(TIFF_VERSION_CLASSIC) +// libtiff 4.0 splits it into TIFF_VERSION_CLASSIC and TIFF_VERSION_BIG +# define TIFF_VERSION TIFF_VERSION_CLASSIC +#endif + #if !defined(TIFF_VERSION) # error "Required libtiff not found" #elif TIFF_VERSION < 42 |