From 579df235090708f92b4d43bfaaff041595b4ce43 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2019 11:06:27 +0000 Subject: import ImageMagick-6.7.8.9-18.el7 --- diff --git a/SOURCES/rhbz1633602-quantize.patch b/SOURCES/rhbz1633602-quantize.patch index 8e5418f..bf15493 100644 --- a/SOURCES/rhbz1633602-quantize.patch +++ b/SOURCES/rhbz1633602-quantize.patch @@ -102,7 +102,7 @@ diff -up ImageMagick-6.7.8-9/magick/quantize.c.quantize ImageMagick-6.7.8-9/magi static void ReduceImageColors(const Image *image,CubeInfo *cube_info) { #define ReduceImageTag "Reduce/Image" -@@ -3002,6 +3080,28 @@ static void ReduceImageColors(const Imag +@@ -3002,6 +3080,29 @@ static void ReduceImageColors(const Imag span; cube_info->next_threshold=0.0; @@ -122,8 +122,9 @@ diff -up ImageMagick-6.7.8-9/magick/quantize.c.quantize ImageMagick-6.7.8-9/magi + cube_info->nodes,quantize_error); + qsort(quantize_error,cube_info->nodes,sizeof(MagickRealType), + MagickRealTypeCompare); -+ cube_info->next_threshold=quantize_error[cube_info->nodes- -+ cube_info->maximum_colors]; ++ if (cube_info->nodes > (110*(cube_info->maximum_colors+1)/100)) ++ cube_info->next_threshold=quantize_error[cube_info->nodes-110* ++ (cube_info->maximum_colors+1)/100]; + quantize_error=(MagickRealType *) RelinquishMagickMemory( + quantize_error); + } diff --git a/SPECS/ImageMagick.spec b/SPECS/ImageMagick.spec index 2810256..253acf2 100644 --- a/SPECS/ImageMagick.spec +++ b/SPECS/ImageMagick.spec @@ -3,7 +3,7 @@ Name: ImageMagick Version: %{VER}.%{Patchlevel} -Release: 16%{?dist} +Release: 18%{?dist} Summary: An X application for displaying and manipulating images Group: Applications/Multimedia License: ImageMagick @@ -30,6 +30,7 @@ BuildRequires: ghostscript-devel BuildRequires: libwmf-devel, jasper-devel, libtool-ltdl-devel BuildRequires: libX11-devel, libXext-devel, libXt-devel BuildRequires: libxml2-devel, librsvg2-devel, OpenEXR-devel +BuildRequires: lcms2-devel %description ImageMagick is an image display and manipulation tool for the X @@ -163,6 +164,7 @@ cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples --with-perl-options="INSTALLDIRS=vendor %{?perl_prefix} CC='%__cc -L$PWD/magick/.libs' LDDLFLAGS='-shared -L$PWD/magick/.libs'" \ --without-dps \ --without-included-ltdl --with-ltdl-include=%{_includedir} \ + --with-lcms2=yes \ --with-ltdl-lib=%{_libdir} # Disable rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -301,6 +303,12 @@ rm -rf %{buildroot} %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Thu Apr 11 2019 Jan Horak - 6.7.8.9-18 +- Fixed white images + +* Tue Jan 8 2019 Jan Horak - 6.7.8.9-17 +- Enable lcms2 support (rhbz#1585291) + * Wed Oct 24 2018 Jan Horak - 6.7.8.9-16 - Added fix for long convert under some circumstances (rhbz#1633602)