[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] libs/threadimageio: Get rid of warning: avoid unnecessary call if file path is not availab
From:       Marcel Wiesweg <marcel.wiesweg () gmx ! de>
Date:       2014-11-16 18:04:51
Message-ID: E1Xq4Bv-0007Vt-20 () scm ! kde ! org
[Download RAW message or body]

Git commit 8cac77758656cde474b51c6bb00a44c7b2b6383e by Marcel Wiesweg.
Committed on 16/11/2014 at 16:26.
Pushed by mwiesweg into branch 'master'.

Get rid of warning: avoid unnecessary call if file path is not available

M  +2    -2    libs/threadimageio/thumbnailcreator.cpp

http://commits.kde.org/digikam/8cac77758656cde474b51c6bb00a44c7b2b6383e

diff --git a/libs/threadimageio/thumbnailcreator.cpp \
b/libs/threadimageio/thumbnailcreator.cpp index 29c704c..633997a 100644
--- a/libs/threadimageio/thumbnailcreator.cpp
+++ b/libs/threadimageio/thumbnailcreator.cpp
@@ -982,8 +982,8 @@ ThumbnailImage ThumbnailCreator::loadFromDatabase(const \
ThumbnailInfo& info) con  
     // Give priority to main database's rotation flag
     // NOTE: Breaks rotation of RAWs which do not contain JPEG previews
-    image.exifOrientation = DMetadata::ORIENTATION_UNSPECIFIED;
-    if (LoadSaveThread::infoProvider())
+    image.exifOrientation = info.orientationHint;
+    if (image.exifOrientation == DMetadata::ORIENTATION_UNSPECIFIED && \
!info.filePath.isEmpty() && LoadSaveThread::infoProvider())  {
         image.exifOrientation = \
LoadSaveThread::infoProvider()->orientationHint(info.filePath);  }


[prev in list] [next in list] [prev in thread] [next in thread]