diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-14 10:27:11 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-14 10:27:11 +0100 |
commit | a0dfb529325e0def520dd11853d76a85d78a393b (patch) | |
tree | 696de2c441060e8c6ed53278ff8b76f9f66e63f6 | |
parent | a10fec1d386efd99f95973c7d446f94622a5da56 (diff) | |
parent | 892d4a0df7dccc6e70586835bb1211cf1b79bc69 (diff) |
Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1
Change-Id: Ifbf48df8a449de12d91631d44cab0320dfd5f699
-rw-r--r-- | dist/changes-5.10.1 | 26 | ||||
-rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_print.c | 8 |
2 files changed, 30 insertions, 4 deletions
diff --git a/dist/changes-5.10.1 b/dist/changes-5.10.1 new file mode 100644 index 0000000..23e448c --- /dev/null +++ b/dist/changes-5.10.1 @@ -0,0 +1,26 @@ +Qt 5.10.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.10.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.10 series is binary compatible with the 5.9.x series. +Applications compiled for 5.9 will continue to run with 5.10. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +This release contains all fixes included in the Qt 5.9.4 release. + +**************************************************************************** +* Qt 5.10.1 Changes * +**************************************************************************** + +- This release contains only minor code improvements. diff --git a/src/3rdparty/libtiff/libtiff/tif_print.c b/src/3rdparty/libtiff/libtiff/tif_print.c index 24d4b98..f494cfb 100644 --- a/src/3rdparty/libtiff/libtiff/tif_print.c +++ b/src/3rdparty/libtiff/libtiff/tif_print.c @@ -667,13 +667,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) fprintf(fd, " %3lu: [%8I64u, %8I64u]\n", (unsigned long) s, - (unsigned __int64) td->td_stripoffset[s], - (unsigned __int64) td->td_stripbytecount[s]); + td->td_stripoffset ? (unsigned __int64) td->td_stripoffset[s] : 0, + td->td_stripbytecount ? (unsigned __int64) td->td_stripbytecount[s] : 0); #else fprintf(fd, " %3lu: [%8llu, %8llu]\n", (unsigned long) s, - (unsigned long long) td->td_stripoffset[s], - (unsigned long long) td->td_stripbytecount[s]); + td->td_stripoffset ? (unsigned long long) td->td_stripoffset[s] : 0, + td->td_stripbytecount ? (unsigned long long) td->td_stripbytecount[s] : 0); #endif } } |