summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/imageformats')
-rw-r--r--src/plugins/imageformats/tiff/qtiffhandler.cpp4
-rw-r--r--src/plugins/imageformats/webp/qwebphandler.cpp2
2 files changed, 3 insertions, 3 deletions
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,