diff options
| author |   Eric Hameleers <alien@slackware.com> | 2020-07-31 16:13:18 +0200 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2020-07-31 16:13:18 +0200 |
| commit | 703149752c6265b36973d2c1f0f5a69721e3128a (patch) | |
| tree | 7ded0d801771d5705f48ffbfb48f37dd4829439e /kde/patch/digikam/digikam_imagemagick7.patch | |
| parent | dd005500c624d127321ff3fe14a0c29bfa8d67f7 (diff) | |
| parent | cd7ff1719433fbb3b6a8304596be173bc1b91b00 (diff) | |
| download | ktown-master.tar.gz ktown-master.tar.xz | |
Diffstat (limited to 'kde/patch/digikam/digikam_imagemagick7.patch')
| -rw-r--r-- | kde/patch/digikam/digikam_imagemagick7.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/kde/patch/digikam/digikam_imagemagick7.patch b/kde/patch/digikam/digikam_imagemagick7.patch deleted file mode 100644 index 04a7752..0000000 --- a/kde/patch/digikam/digikam_imagemagick7.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 - |