Bundled libtiff updated to version 4.0.6v5.6.0-beta1

Upstream changes since 4.0.3 have been merged in. Our local tif_conf.h
have been updated according to the upstream changes in tif_conf.h.in.

Change-Id: I1c2aef6f0f60377de4876e25df723c32a6f95ea6
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>

1 files changed, 64 insertions, 0 deletions

diff --git a/src/3rdparty/libtiff/libtiff/tif_config.vc.h b/src/3rdparty/libtiff/libtiff/tif_config.vc.h
index c297cf3..7e6c5c2 100644
--- a/src/3rdparty/libtiff/libtiff/tif_config.vc.h
+++ b/src/3rdparty/libtiff/libtiff/tif_config.vc.h
@@ -1,3 +1,6 @@
+#ifndef _TIF_CONFIG_H_
+#define _TIF_CONFIG_H_
+
 /* Define to 1 if you have the <assert.h> header file. */
 #define HAVE_ASSERT_H 1
 
@@ -26,6 +29,9 @@
 /* Define to 1 if you have the `setmode' function. */
 #define HAVE_SETMODE 1
 
+/* Define to 1 if you have the declaration of `optarg', and to 0 if you don't. */
+#define HAVE_DECL_OPTARG 0
+
 /* The size of a `int', as computed by sizeof. */
 #define SIZEOF_INT 4
 
@@ -44,10 +50,64 @@
 /* Unsigned 64-bit type */
 #define TIFF_UINT64_T unsigned __int64
 
+#if _WIN64
+/*
+  Windows 64-bit build
+*/
+
+/* Pointer difference type */
+#  define TIFF_PTRDIFF_T TIFF_INT64_T
+
+/* The size of `size_t', as computed by sizeof. */
+#  define SIZEOF_SIZE_T 8
+
+/* Size type formatter */
+#  define TIFF_SIZE_FORMAT TIFF_INT64_FORMAT
+
+/* Unsigned size type */
+#  define TIFF_SIZE_T TIFF_UINT64_T
+
+/* Signed size type formatter */
+#  define TIFF_SSIZE_FORMAT TIFF_INT64_FORMAT
+
+/* Signed size type */
+#  define TIFF_SSIZE_T TIFF_INT64_T
+
+#else
+/*
+  Windows 32-bit build
+*/
+
+/* Pointer difference type */
+#  define TIFF_PTRDIFF_T signed int
+
+/* The size of `size_t', as computed by sizeof. */
+#  define SIZEOF_SIZE_T 4
+
+/* Size type formatter */
+#  define TIFF_SIZE_FORMAT "%u"
+
+/* Size type formatter */
+#  define TIFF_SIZE_FORMAT "%u"
+
+/* Unsigned size type */
+#  define TIFF_SIZE_T unsigned int
+
+/* Signed size type formatter */
+#  define TIFF_SSIZE_FORMAT "%d"
+
+/* Signed size type */
+#  define TIFF_SSIZE_T signed int
+
+#endif
+
 /* Set the native cpu bit order */
 #define HOST_FILLORDER FILLORDER_LSB2MSB
 
+/* Visual Studio 2015 / VC 14 / MSVC 19.00 finally has snprintf() */
+#if defined(_MSC_VER) && _MSC_VER < 1900
 #define snprintf _snprintf
+#endif
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
@@ -62,6 +122,10 @@
 #endif
 
 #define lfind _lfind
+
+#pragma warning(disable : 4996) /* function deprecation warnings */
+
+#endif /* _TIF_CONFIG_H_ */
 /*
  * Local Variables:
  * mode: c