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

List:       kde-commits
Subject:    KDE/kdeplasma-addons/applets/frame
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2010-09-08 20:24:22
Message-ID: 20100908202422.388B3AC876 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1173160 by annma:

during threading support addition, EXIF rotation got lost. Need to be backported to \
4.5 branch (will do tomorrow). Thanks to Elõd for reporting the problem! \
CCMAIL=csaszare@gmail.com


 M  +1 -1      CMakeLists.txt  
 M  +2 -2      imageloader.cpp  
 M  +1 -1      imageloader.h  
 M  +1 -1      picture.cpp  


--- trunk/KDE/kdeplasma-addons/applets/frame/CMakeLists.txt #1173159:1173160
@@ -20,7 +20,7 @@
 
 if(HAVE_KEXIV2)
     include_directories( ${KEXIV2_INCLUDES} )
-    set_source_files_properties(picture.cpp PROPERTIES
+    set_source_files_properties(picture.cpp imageloader.cpp PROPERTIES
                                COMPILE_FLAGS -DHAVE_KEXIV2)
     target_link_libraries(plasma_applet_frame ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} \
${KDE4_KFILE_LIBS} ${KEXIV2_LIBRARIES} )  else (HAVE_KEXIV2)
--- trunk/KDE/kdeplasma-addons/applets/frame/imageloader.cpp #1173159:1173160
@@ -31,7 +31,7 @@
     m_path = path;
 }
 
-QImage ImageLoader::correctRotation(const QImage& tempImage)
+QImage ImageLoader::correctRotation(const QImage& tempImage, const QString &path)
 {
     QImage image = QImage();
     if (!tempImage.isNull()) {
@@ -81,7 +81,7 @@
 
 void ImageLoader::run()
 {
-    QImage img = correctRotation(QImage(m_path));
+    QImage img = correctRotation(QImage(m_path), m_path);
     emit loaded(img);
 }
 
--- trunk/KDE/kdeplasma-addons/applets/frame/imageloader.h #1173159:1173160
@@ -32,7 +32,7 @@
 
 public:
     ImageLoader(const QString &path);
-    static QImage correctRotation(const QImage& tempImage);
+    static QImage correctRotation(const QImage& tempImage, const QString &path);
     void run();
 
 Q_SIGNALS:
--- trunk/KDE/kdeplasma-addons/applets/frame/picture.cpp #1173159:1173160
@@ -139,7 +139,7 @@
         setPath(path);
     }
     
-    emit checkImageLoaded(ImageLoader::correctRotation(image));
+    emit checkImageLoaded(ImageLoader::correctRotation(image, path));
 }
 
 void Picture::checkImageLoaded(QImage newImage)


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