From 15b01070b40784776b844616f338adca9fb8048e22cfc6a1cf9fb2818ff9843b Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 31 Aug 2020 13:31:04 +0000 Subject: [PATCH] - fix bsc#1106272 - added patches fix https://github.com/ImageMagick/ImageMagick/commit/029fb3425ecf82e8b30c060e38a135d1d3e76bb3 + ImageMagick-set-correct-colorspace.patch OBS-URL: https://build.opensuse.org/package/show/graphics/ImageMagick?expand=0&rev=519 --- ImageMagick-set-correct-colorspace.patch | 22 ++++++++++++++++++++++ ImageMagick.changes | 8 ++++++++ ImageMagick.spec | 3 +++ 3 files changed, 33 insertions(+) create mode 100644 ImageMagick-set-correct-colorspace.patch diff --git a/ImageMagick-set-correct-colorspace.patch b/ImageMagick-set-correct-colorspace.patch new file mode 100644 index 0000000..0655228 --- /dev/null +++ b/ImageMagick-set-correct-colorspace.patch @@ -0,0 +1,22 @@ +diff --git a/coders/plasma.c b/coders/plasma.c +index 9e4ee8aa79..de62ca6dd4 100644 +--- a/coders/plasma.c ++++ b/coders/plasma.c +@@ -44,6 +44,7 @@ + #include "MagickCore/blob-private.h" + #include "MagickCore/cache.h" + #include "MagickCore/channel.h" ++#include "MagickCore/colorspace-private.h" + #include "MagickCore/constitute.h" + #include "MagickCore/exception.h" + #include "MagickCore/exception-private.h" +@@ -154,6 +155,8 @@ static Image *ReadPlasmaImage(const ImageInfo *image_info, + if (image == (Image *) NULL) + return((Image *) NULL); + (void) SetImageStorageClass(image,DirectClass,exception); ++ if (IsGrayColorspace(image->colorspace) != MagickFalse) ++ (void) SetImageColorspace(image,sRGBColorspace,exception); + for (y=0; y < (ssize_t) image->rows; y++) + { + q=GetAuthenticPixels(image,0,y,image->columns,1,exception); + diff --git a/ImageMagick.changes b/ImageMagick.changes index b16ae06..d6ca7b4 100644 --- a/ImageMagick.changes +++ b/ImageMagick.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Aug 31 13:30:24 UTC 2020 - pgajdos@suse.com + +- fix bsc#1106272 +- added patches + fix https://github.com/ImageMagick/ImageMagick/commit/029fb3425ecf82e8b30c060e38a135d1d3e76bb3 + + ImageMagick-set-correct-colorspace.patch + ------------------------------------------------------------------- Mon Aug 31 07:56:37 UTC 2020 - pgajdos@suse.com diff --git a/ImageMagick.spec b/ImageMagick.spec index 031cdb4..eb06dd9 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -48,6 +48,8 @@ Patch0: ImageMagick-configuration-SUSE.patch Patch2: ImageMagick-library-installable-in-parallel.patch #%%ifarch s390x s390 ppc64 ppc Patch3: ImageMagick-s390-disable-tests.patch +# https://github.com/ImageMagick/ImageMagick/commit/029fb3425ecf82e8b30c060e38a135d1d3e76bb3 +Patch4: ImageMagick-set-correct-colorspace.patch #%%endif BuildRequires: chrpath BuildRequires: fdupes @@ -333,6 +335,7 @@ preserved. %ifarch s390x s390 ppc ppc64 %patch3 -p1 %endif +%patch4 -p1 %build # bsc#1088463