From 84eae855ee57ab1c37c8a84ad7e7afcd40b919e6 Mon Sep 17 00:00:00 2001
From: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
Date: Wed, 18 Nov 2015 16:58:45 +0100
Subject: Improve format detection in the image reader plugin

canRead() would reject a file starting with an xml comment.

canRead() by design accepts anything that looks like the start of an
xml file, and the comment token "<!--" should be an indicator as good
as any of an xml file.

Task-number: QTBUG-49496
Change-Id: Id3c17f6b02344fa6a20bc2a839e345e5cebc14c2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
---
 src/plugins/imageformats/svg/qsvgiohandler.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/plugins/imageformats/svg/qsvgiohandler.cpp')

diff --git a/src/plugins/imageformats/svg/qsvgiohandler.cpp b/src/plugins/imageformats/svg/qsvgiohandler.cpp
index 8790796..8a9cbb2 100644
--- a/src/plugins/imageformats/svg/qsvgiohandler.cpp
+++ b/src/plugins/imageformats/svg/qsvgiohandler.cpp
@@ -122,7 +122,7 @@ bool QSvgIOHandler::canRead() const
     if (buf.startsWith("\x1f\x8b")) {
         setFormat("svgz");
         return true;
-    } else if (buf.contains("<?xml") || buf.contains("<svg")) {
+    } else if (buf.contains("<?xml") || buf.contains("<svg") || buf.contains("<!--")) {
         setFormat("svg");
         return true;
     }
@@ -251,7 +251,7 @@ bool QSvgIOHandler::supportsOption(ImageOption option) const
 bool QSvgIOHandler::canRead(QIODevice *device)
 {
     QByteArray buf = device->peek(8);
-    return buf.startsWith("\x1f\x8b") || buf.contains("<?xml") || buf.contains("<svg");
+    return buf.startsWith("\x1f\x8b") || buf.contains("<?xml") || buf.contains("<svg") || buf.contains("<!--");
 }
 
 QT_END_NAMESPACE
-- 
cgit v1.2.1