diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/tiff/qtiffhandler.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/imageformats/webp/qwebphandler.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index 2108ac6..138038d 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.9.3 +MODULE_VERSION = 5.10.0 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 7f7bdd9..7bea4d0 100644 --- a/src/plugins/imageformats/webp/qwebphandler.cpp +++ b/src/plugins/imageformats/webp/qwebphandler.cpp @@ -177,7 +177,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, |