File Fix-build-with-exiv2-0.28.patch of Package kdebase4-runtime

Overview Repositories Revisions Requests Users Attributes Meta

File Fix-build-with-exiv2-0.28.patch of Package kdebase4-runtime

diff --git a/kioslave/thumbnail/jpegcreator.cpp b/kioslave/thumbnail/jpegcreator.cpp
--- a/kioslave/thumbnail/jpegcreator.cpp
+++ b/kioslave/thumbnail/jpegcreator.cpp
@@ -29,8 +29,7 @@
 #include <klocale.h>
 
 #ifdef HAVE_EXIV2
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
 #endif
 
 extern "C"
@@ -257,7 +256,11 @@
     if (settings->rotate()) {
         //Handle exif rotation
         try {
+#if EXIV2_TEST_VERSION(0,28,0)
+            Exiv2::Image::UniquePtr exivImg = Exiv2::ImageFactory::open(name.constData());
+#else
             Exiv2::Image::AutoPtr exivImg = Exiv2::ImageFactory::open(name.constData());
+#endif
             if (exivImg.get()) {
                 exivImg->readMetadata();
                 Exiv2::ExifData exifData = exivImg->exifData();
@@ -265,7 +268,11 @@
                     Exiv2::ExifKey key("Exif.Image.Orientation");
                     Exiv2::ExifData::iterator it = exifData.findKey(key);
                     if (it != exifData.end()) {
+#if EXIV2_TEST_VERSION(0,28,0)
+                        int orient = it->toUint32();
+#else
                         int orient = it->toLong();
+#endif
                         image = img.transformed(orientationMatrix(orient));
                         return true;
                     }

Places

File Fix-build-with-exiv2-0.28.patch of Package kdebase4-runtime

Places