summaryrefslogtreecommitdiffstats
path: root/kde/patch/digikam/digikam_imagemagick7.patch
diff options
context:
space:
mode:
Diffstat (limited to 'kde/patch/digikam/digikam_imagemagick7.patch')
-rw-r--r--kde/patch/digikam/digikam_imagemagick7.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/kde/patch/digikam/digikam_imagemagick7.patch b/kde/patch/digikam/digikam_imagemagick7.patch
new file mode 100644
index 0000000..04a7752
--- /dev/null
+++ b/kde/patch/digikam/digikam_imagemagick7.patch
@@ -0,0 +1,40 @@
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Thu, 7 Nov 2019 09:25:02 +0100
+Subject: Properly initialize ExceptionInfo in libMagick
+
+Otherwise it will crash if some plugins can't be loaded.
+
+diff --git a/core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp b/core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp
+index 1858b4d..20ef01b 100644
+--- a/core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp
++++ b/core/dplugins/dimg/imagemagick/dimgimagemagickplugin.cpp
+@@ -125,7 +125,7 @@ QMap<QString, QString> DImgImageMagickPlugin::extraAboutData() const
+ QString mimes = typeMimes();
+
+ QMap<QString, QString> map;
+- ExceptionInfo ex;
++ ExceptionInfo ex = *AcquireExceptionInfo();
+ size_t n = 0;
+ const MagickInfo** inflst = GetMagickInfoList("*", &n, &ex);
+
+@@ -219,7 +219,7 @@ int DImgImageMagickPlugin::canRead(const QFileInfo& fileInfo, bool magic) const
+ int DImgImageMagickPlugin::canWrite(const QString& format) const
+ {
+ QStringList formats;
+- ExceptionInfo ex;
++ ExceptionInfo ex = *AcquireExceptionInfo();
+ size_t n = 0;
+ const MagickInfo** inflst = GetMagickInfoList("*", &n, &ex);
+
+@@ -266,7 +266,7 @@ DImgLoader* DImgImageMagickPlugin::loader(DImg* const image, const DRawDecoding&
+ QStringList DImgImageMagickPlugin::decoderFormats() const
+ {
+ QStringList formats;
+- ExceptionInfo ex;
++ ExceptionInfo ex = *AcquireExceptionInfo();
+ size_t n = 0;
+ const MagickInfo** inflst = GetMagickInfoList("*", &n, &ex);
+
+--
+cgit v1.1
+