diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dist/changes-5.10.0 | 27 | ||||
| -rw-r--r-- | src/plugins/imageformats/tiff/qtiffhandler.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/imageformats/webp/qwebphandler.cpp | 2 |
4 files changed, 31 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index 4f571fb..0338efe 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.9.4 +MODULE_VERSION = 5.10.1 diff --git a/dist/changes-5.10.0 b/dist/changes-5.10.0 new file mode 100644 index 0000000..375a223 --- /dev/null +++ b/dist/changes-5.10.0 @@ -0,0 +1,27 @@ +Qt 5.10 introduces many new features and improvements as well as bugfixes +over the 5.9.x series. 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.10.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. + +**************************************************************************** +* Qt 5.10.0 Changes * +**************************************************************************** + + - This release contains only minor code improvements. + +Third-Party Code +---------------- + + - Bundled libtiff was updated to version 4.0.8+ diff --git a/src/plugins/imageformats/tiff/qtiffhandler.cpp b/src/plugins/imageformats/tiff/qtiffhandler.cpp index 81ad7e9..8f3d3e4 100644 --- a/src/plugins/imageformats/tiff/qtiffhandler.cpp +++ b/src/plugins/imageformats/tiff/qtiffhandler.cpp @@ -335,8 +335,8 @@ bool QTiffHandler::read(QImage *image) } TIFF *const tiff = d->tiff; - const uint32 width = d->size.width(); - const uint32 height = d->size.height(); + const quint32 width = d->size.width(); + const quint32 height = d->size.height(); if (format == QImage::Format_Mono || format == QImage::Format_Indexed8 || format == QImage::Format_Grayscale8) { if (format == QImage::Format_Mono) { diff --git a/src/plugins/imageformats/webp/qwebphandler.cpp b/src/plugins/imageformats/webp/qwebphandler.cpp index c59bc40..3a7bf43 100644 --- a/src/plugins/imageformats/webp/qwebphandler.cpp +++ b/src/plugins/imageformats/webp/qwebphandler.cpp @@ -176,7 +176,7 @@ bool QWebpHandler::read(QImage *image) QImage frame(m_iter.width, m_iter.height, QImage::Format_ARGB32); uint8_t *output = frame.bits(); - size_t output_size = frame.byteCount(); + size_t output_size = frame.sizeInBytes(); #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN if (!WebPDecodeBGRAInto( reinterpret_cast<const uint8_t*>(m_iter.fragment.bytes), m_iter.fragment.size, |