summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-06-26 15:42:49 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-06-28 09:03:49 +0000
commitfdef1dc7fe0ff721b393fa9077117869a5d6ac01 (patch)
treea94ce2ad612d8ee981d86cab4d2d235b1f9e9d56
parent7d5e849e2808e9051a6d3ab19f29109b852f7bc9 (diff)
Fix decoding of JPEGs with invalid EXIF headers
We should accept JPEGs with broken EXIF headers since the header is optional and can be ignored if broken. Task-number: QTBUG-46870 Change-Id: I494e5497b8449ce6494285d4d77caadbbb0ccaf8 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
-rw-r--r--src/gui/image/qjpeghandler.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp
index 4ff3917fe6..c0fda647aa 100644
--- a/src/gui/image/qjpeghandler.cpp
+++ b/src/gui/image/qjpeghandler.cpp
@@ -929,8 +929,6 @@ bool QJpegHandlerPrivate::readJpegHeader(QIODevice *device)
if (!exifData.isEmpty()) {
// Exif data present
int exifOrientation = getExifOrientation(exifData);
- if (exifOrientation == -1)
- return false;
if (exifOrientation > 0)
transformation = exif2Qt(exifOrientation);
}