From 0989f6aa2d45426c10bcfd60272486a8b34c8e44 Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Mon, 11 Mar 2019 14:07:02 +0100 Subject: tiff handler: fix compilation failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoid using the tmsize_t type, since it may not be defined. Fixes: QTBUG-74283 Change-Id: I63a496173ec08c6ceac569c516d11a4711e32649 Reviewed-by: Richard Öhlinger Reviewed-by: Allan Sandfeld Jensen --- src/plugins/imageformats/tiff/qtiffhandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/imageformats/tiff/qtiffhandler.cpp b/src/plugins/imageformats/tiff/qtiffhandler.cpp index edb5443..e6c7175 100644 --- a/src/plugins/imageformats/tiff/qtiffhandler.cpp +++ b/src/plugins/imageformats/tiff/qtiffhandler.cpp @@ -526,7 +526,7 @@ static QVector effectiveColorTable(const QImage &image) static quint32 defaultStripSize(TIFF *tiff) { // Aim for 4MB strips - qint64 scanSize = qMax(tmsize_t(1), TIFFScanlineSize(tiff)); + qint64 scanSize = qMax(qint64(1), qint64(TIFFScanlineSize(tiff))); qint64 numRows = (4 * 1024 * 1024) / scanSize; quint32 reqSize = static_cast(qBound(qint64(1), numRows, qint64(UINT_MAX))); return TIFFDefaultStripSize(tiff, reqSize); -- cgit v1.2.3