24 lines
941 B
Diff
24 lines
941 B
Diff
|
commit e2eeb730d02aad858f15c6f35f2a6b6beb38acf5
|
||
|
|
Author: Gilles Caulier <caulier.gilles@gmail.com>
|
||
|
|
Date: Tue Sep 23 10:28:39 2014 +0200
|
||
|
|
|
||
|
|
Another place where we need to handle right libkexiv2 version to extract preview and prevent crash in Exiv2 preview extractor.
|
||
|
|
CCBUGS: 339144
|
||
|
|
|
||
|
|
diff --git a/core/libs/threadimageio/previewtask.cpp b/core/libs/threadimageio/previewtask.cpp
|
||
|
|
index 3c3b72a..99bb4d6 100644
|
||
|
|
--- a/core/libs/threadimageio/previewtask.cpp
|
||
|
|
+++ b/core/libs/threadimageio/previewtask.cpp
|
||
|
|
@@ -254,7 +254,11 @@ void PreviewLoadingTask::execute()
|
||
|
|
// require at least half preview size
|
||
|
|
if (qMax(previews.width(), previews.height()) >= sizeLimit)
|
||
|
|
{
|
||
|
|
+
|
||
|
|
+ // See bug #339144 : only handle preview if right libkexiv2 version is used.
|
||
|
|
+#if KEXIV2_VERSION >= 0x020302
|
||
|
|
qimage = previews.image();
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
if (!qimage.isNull())
|
||
|
|
{
|