[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [gwenview] lib: Revert "Fix for wrong rotation of RAW images"
From: Aurélien Gâteau <agateau () kde ! org>
Date: 2015-03-31 14:51:10
Message-ID: E1YcxVW-0005Jo-BU () scm ! kde ! org
[Download RAW message or body]
Git commit 7ede0208d7f7279439cb5a288c5ad11c7907bd8d by Aurélien Gâteau.
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/loadingdocumentimpl.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 = 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 \
trying to save mFormat = mFormatHint;
-
- mIsRawImage = true;
} else {
#else
{
@@ -321,7 +318,7 @@ struct LoadingDocumentImplPrivate
return;
}
- if (mJpegContent.get() && GwenviewConfig::applyExifOrientation() \
&& !mIsRawImage) { + if (mJpegContent.get() && \
GwenviewConfig::applyExifOrientation()) {
Gwenview::Orientation orientation = \
mJpegContent->orientation(); QMatrix matrix = \
ImageUtils::transformMatrix(orientation); mImage = \
mImage.transformed(matrix);
diff --git a/lib/thumbnailprovider/thumbnailgenerator.cpp \
b/lib/thumbnailprovider/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 = 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::applyExifOrientation() && !mIsRawImage) { + if \
(!content.rawData().isEmpty() && GwenviewConfig::applyExifOrientation()) { \
QImage thumbnail = content.thumbnail(); orientation = \
content.orientation();
diff --git a/lib/thumbnailprovider/thumbnailgenerator.h \
b/lib/thumbnailprovider/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 = false;
bool load(const QString &pixPath, int pixelSize);
};
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic