From 85ed63f825da57103c68f73af5adeebf67db0da9 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@qt.io>
Date: Mon, 26 Jun 2017 16:00:39 +0200
Subject: [PATCH] Fix QWebpHandler::canRead() to take animation frame count
into account
Task-number: QTBUG-61641
Change-Id: I24a139cc75141a588f2ed2558da85cd2f8391af9
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
---
src/plugins/imageformats/webp/qwebphandler.cpp | 4 ++++
tests/auto/webp/tst_qwebp.cpp | 1 +
2 files changed, 5 insertions(+)
diff --git a/src/plugins/imageformats/webp/qwebphandler.cpp b/src/plugins/imageformats/webp/qwebphandler.cpp
index 0bd89f6f..5a0ae4ad 100644
--- a/src/plugins/imageformats/webp/qwebphandler.cpp
+++ b/src/plugins/imageformats/webp/qwebphandler.cpp
@@ -74,6 +74,10 @@ bool QWebpHandler::canRead() const
if (m_scanState != ScanError) {
setFormat(QByteArrayLiteral("webp"));
+
+ if (m_features.has_animation && m_iter.frame_num >= m_frameCount)
+ return false;
+
return true;
}
return false;
diff --git a/tests/auto/webp/tst_qwebp.cpp b/tests/auto/webp/tst_qwebp.cpp
index d1d30dbe..ad4a376b 100644
--- a/tests/auto/webp/tst_qwebp.cpp
+++ b/tests/auto/webp/tst_qwebp.cpp
@@ -127,6 +127,7 @@ void tst_qwebp::readAnimation()
}
QVERIFY(reader.read().isNull());
+ QCOMPARE(reader.canRead(), !reader.supportsAnimation());
}
void tst_qwebp::writeImage_data()
--
GitLab