From kde-commits  Tue Mar 31 14:51:10 2015
From: =?utf-8?b?QXVyw6lsaWVuIEfDonRlYXU=?= <agateau () kde ! org>
Date: Tue, 31 Mar 2015 14:51:10 +0000
To: kde-commits
Subject: [gwenview] lib: Revert "Fix for wrong rotation of RAW images"
Message-Id: <E1YcxVW-0005Jo-BU () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=142781348022111

Git commit 7ede0208d7f7279439cb5a288c5ad11c7907bd8d by Aur=C3=A9lien G=C3=
=A2teau.
Committed on 31/03/2015 at 14:50.
Pushed by gateau into branch 'master'.

Revert "Fix for wrong rotation of RAW images"

This reverts commit f383a05dd25ce924094518962a4d82cbc914ee32.

Sorry, I committed this patch by mistake. See reviewboard for explanations.

M  +1    -4    lib/document/loadingdocumentimpl.cpp
M  +1    -2    lib/thumbnailprovider/thumbnailgenerator.cpp
M  +0    -1    lib/thumbnailprovider/thumbnailgenerator.h

http://commits.kde.org/gwenview/7ede0208d7f7279439cb5a288c5ad11c7907bd8d

diff --git a/lib/document/loadingdocumentimpl.cpp b/lib/document/loadingdoc=
umentimpl.cpp
index 8477c28..cc8bea9 100644
--- a/lib/document/loadingdocumentimpl.cpp
+++ b/lib/document/loadingdocumentimpl.cpp
@@ -104,7 +104,6 @@ struct LoadingDocumentImplPrivate
     std::auto_ptr<JpegContent> mJpegContent;
     QImage mImage;
     Cms::Profile::Ptr mCmsProfile;
-    bool mIsRawImage =3D false;
 =

     /**
      * Determine kind of document and switch to an implementation if it is=
 not
@@ -223,8 +222,6 @@ struct LoadingDocumentImplPrivate
 =

             // need to fill mFormat so gwenview can tell the type when try=
ing to save
             mFormat =3D mFormatHint;
-
-            mIsRawImage =3D true;
         } else {
 #else
 {
@@ -321,7 +318,7 @@ struct LoadingDocumentImplPrivate
             return;
         }
 =

-        if (mJpegContent.get() && GwenviewConfig::applyExifOrientation() &=
& !mIsRawImage) {
+        if (mJpegContent.get() && GwenviewConfig::applyExifOrientation()) {
             Gwenview::Orientation orientation =3D mJpegContent->orientatio=
n();
             QMatrix matrix =3D ImageUtils::transformMatrix(orientation);
             mImage =3D mImage.transformed(matrix);
diff --git a/lib/thumbnailprovider/thumbnailgenerator.cpp b/lib/thumbnailpr=
ovider/thumbnailgenerator.cpp
index 36d55e8..54875f5 100644
--- a/lib/thumbnailprovider/thumbnailgenerator.cpp
+++ b/lib/thumbnailprovider/thumbnailgenerator.cpp
@@ -102,7 +102,6 @@ bool ThumbnailContext::load(const QString &pixPath, int=
 pixelSize)
         buffer.open(QIODevice::ReadOnly);
         reader.setDevice(&buffer);
         reader.setFormat(formatHint);
-        mIsRawImage =3D true;
     } else {
 #else
     {
@@ -122,7 +121,7 @@ bool ThumbnailContext::load(const QString &pixPath, int=
 pixelSize)
     // If applyExifOrientation is not set, don't use the
     // embedded thumbnail since it might be rotated differently
     // than the actual image
-    if (!content.rawData().isEmpty() && GwenviewConfig::applyExifOrientati=
on() && !mIsRawImage) {
+    if (!content.rawData().isEmpty() && GwenviewConfig::applyExifOrientati=
on()) {
         QImage thumbnail =3D content.thumbnail();
         orientation =3D content.orientation();
 =

diff --git a/lib/thumbnailprovider/thumbnailgenerator.h b/lib/thumbnailprov=
ider/thumbnailgenerator.h
index 16ed43e..4571832 100644
--- a/lib/thumbnailprovider/thumbnailgenerator.h
+++ b/lib/thumbnailprovider/thumbnailgenerator.h
@@ -41,7 +41,6 @@ struct ThumbnailContext {
     int mOriginalWidth;
     int mOriginalHeight;
     bool mNeedCaching;
-    bool mIsRawImage =3D false;
 =

     bool load(const QString &pixPath, int pixelSize);
 };