kioslave: discard thumbnail from Exiv2 metadata if it is smaller than the requested...

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kioslave/thumbnail/imagecreator.cpp b/kioslave/thumbnail/imagecreator.cpp
index 3bdfac2..4b66109 100644 (file)
--- a/kioslave/thumbnail/imagecreator.cpp
+++ b/kioslave/thumbnail/imagecreator.cpp
@@ -35,12 +35,18 @@ extern "C"
     }
 }
 
-bool ImageCreator::create(const QString &path, int, int, QImage &img)
+bool ImageCreator::create(const QString &path, int width, int height, QImage &img)
 {
     // use preview from Exiv2 metadata if possible
     KExiv2 exiv(path);
     img = exiv.preview();
 
+    // if the thumbnail from Exiv2 metadata is smaller than the request discard it, the preview in
+    // file properties dialog for example often requests large thumbnails
+    if (!img.isNull() && (img.width() < width || img.height() < height)) {
+        img = QImage();
+    }
+
     // create image preview otherwise
     if (img.isNull() && !img.load(path)) {
         return false;

diff --git a/kioslave/thumbnail/imagecreator.h b/kioslave/thumbnail/imagecreator.h
index 23d0b27..c41d971 100644 (file)
--- a/kioslave/thumbnail/imagecreator.h
+++ b/kioslave/thumbnail/imagecreator.h
@@ -26,7 +26,7 @@ class ImageCreator : public ThumbCreator
 {
 public:
     ImageCreator() {}
-    virtual bool create(const QString &path, int, int, QImage &img);
+    virtual bool create(const QString &path, int width, int height, QImage &img);
     virtual Flags flags() const;
     virtual QWidget *createConfigurationWidget();
     virtual void writeConfiguration(const QWidget *configurationWidget);