diff options
| -rw-r--r-- | ImageMagick7-upstream.patch | 45 | ||||
| -rw-r--r-- | ImageMagick7.spec | 3 |
2 files changed, 48 insertions, 0 deletions
diff --git a/ImageMagick7-upstream.patch b/ImageMagick7-upstream.patch new file mode 100644 index 0000000..6ae016f --- /dev/null +++ b/ImageMagick7-upstream.patch @@ -0,0 +1,45 @@ +From 9024139f4bf2f029a05ffaeaaf2158afef342785 Mon Sep 17 00:00:00 2001 +From: Cristy <urban-warrior@imagemagick.org> +Date: Sat, 28 Jan 2017 10:29:55 -0500 +Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/363 + +--- + Magick++/tests/color.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Magick++/tests/color.cpp b/Magick++/tests/color.cpp +index 0ce2ebc..4d12324 100644 +--- a/Magick++/tests/color.cpp ++++ b/Magick++/tests/color.cpp +@@ -40,7 +40,7 @@ int main( int /*argc*/, char **argv) + struct colorStr colorMap [] = + { + { "red", 1,0,0 }, +- { "green", 0,0.5019607843137256,0 }, ++ { "green", 0,0.5019607843137255,0 }, + { "blue", 0,0,1 }, + { "black", 0,0,0 }, + { "white", 1,1,1 }, +From a5c463d59268d2557d90565415b8e5047b25e7d2 Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra <dirk@git.imagemagick.org> +Date: Mon, 30 Jan 2017 13:28:58 +0100 +Subject: [PATCH] Use lime instead of green to avoid rounding issues (fixes + #363). + +--- + Magick++/tests/color.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Magick++/tests/color.cpp b/Magick++/tests/color.cpp +index 4d12324..138ed21 100644 +--- a/Magick++/tests/color.cpp ++++ b/Magick++/tests/color.cpp +@@ -40,7 +40,7 @@ int main( int /*argc*/, char **argv) + struct colorStr colorMap [] = + { + { "red", 1,0,0 }, +- { "green", 0,0.5019607843137255,0 }, ++ { "lime", 0,1,0 }, + { "blue", 0,0,1 }, + { "black", 0,0,0 }, + { "white", 1,1,1 }, diff --git a/ImageMagick7.spec b/ImageMagick7.spec index b63b679..bbdbc5b 100644 --- a/ImageMagick7.spec +++ b/ImageMagick7.spec @@ -497,6 +497,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 30 2017 Remi Collet <remi@remirepo.net> - 7.0.4.6-1 +- add upstream patch for tests on 32bits + * Sat Jan 28 2017 Remi Collet <remi@remirepo.net> - 7.0.4.6-1 - update to version 7.0.4 patchlevel 6 - libMagickCore soname bump to 2 |