diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2015-11-18 16:58:45 +0100 |
|---|---|---|
| committer | aavit <eirik.aavitsland@theqtcompany.com> | 2015-11-20 09:18:00 +0000 |
| commit | 84eae855ee57ab1c37c8a84ad7e7afcd40b919e6 (patch) | |
| tree | 9bf8cd34f4701e0f3fd4ad19a48537a69d22586e /src/plugins/imageformats | |
| parent | 0379fb9186a75394b5cf0a3f5866da3d08b05e18 (diff) | |
| download | qtsvg-84eae855ee57ab1c37c8a84ad7e7afcd40b919e6.tar.gz | |
Improve format detection in the image reader pluginv5.6.0-beta1
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>
Diffstat (limited to 'src/plugins/imageformats')
| -rw-r--r-- | src/plugins/imageformats/svg/qsvgiohandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |