summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Duval <jerome.duval@gmail.com>2017-05-31 20:58:35 +0200
committerJérôme Duval <jerome.duval@gmail.com>2017-06-14 11:21:42 +0000
commit51ab877ae95d79d47fa99c39b1be7c8a570b2339 (patch)
treeea307d6cbbb3527cea01b2e932636ef692515ef1
parent2b7fadfd9c0fc084588af2074f9731041632ec22 (diff)
qtiffhandler: correct types for height and width
qMin() was used with quint32 and uint32. This fixes the build on Haiku. Change-Id: I193f561b9a63ffe9ee5ae991084118a821e3f22d Reviewed-by: Augustin Cavalier <waddlesplash@gmail.com> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
-rw-r--r--src/plugins/imageformats/tiff/qtiffhandler.cpp4
1 files changed, 2 insertions, 2 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) {