From fdef1dc7fe0ff721b393fa9077117869a5d6ac01 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Fri, 26 Jun 2015 15:42:49 +0200
Subject: [PATCH] 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>
---
 src/gui/image/qjpeghandler.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp
index 4ff3917fe62..c0fda647aa4 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);
             }