summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--14d2cea959977a84f0eb65d7b270cf7007375df1.patch36
-rw-r--r--ImageMagick7.spec5
2 files changed, 41 insertions, 0 deletions
diff --git a/14d2cea959977a84f0eb65d7b270cf7007375df1.patch b/14d2cea959977a84f0eb65d7b270cf7007375df1.patch
new file mode 100644
index 0000000..2356d76
--- /dev/null
+++ b/14d2cea959977a84f0eb65d7b270cf7007375df1.patch
@@ -0,0 +1,36 @@
+From 14d2cea959977a84f0eb65d7b270cf7007375df1 Mon Sep 17 00:00:00 2001
+From: Cristy <urban-warrior@imagemagick.org>
+Date: Sun, 9 Oct 2016 14:29:08 -0400
+Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/284
+
+---
+ coders/sun.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/coders/sun.c b/coders/sun.c
+index 6bbe3ac..f224b8b 100644
+--- a/coders/sun.c
++++ b/coders/sun.c
+@@ -266,7 +266,8 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
+ bytes_per_line,
+ extent,
+ height,
+- pixels_length;
++ pixels_length,
++ quantum;
+
+ ssize_t
+ count,
+@@ -442,9 +443,10 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
+ sun_data=(unsigned char *) RelinquishMagickMemory(sun_data);
+ ThrowReaderException(ResourceLimitError,"ImproperImageHeader");
+ }
+- bytes_per_line+=7;
++ quantum=sun_info.depth == 1 ? 15 : 7;
++ bytes_per_line+=quantum;
+ bytes_per_line<<=1;
+- if ((bytes_per_line >> 1) != (sun_info.width*sun_info.depth+7))
++ if ((bytes_per_line >> 1) != (sun_info.width*sun_info.depth+quantum))
+ {
+ sun_data=(unsigned char *) RelinquishMagickMemory(sun_data);
+ ThrowReaderException(ResourceLimitError,"ImproperImageHeader");
diff --git a/ImageMagick7.spec b/ImageMagick7.spec
index 6b569cf..5236f73 100644
--- a/ImageMagick7.spec
+++ b/ImageMagick7.spec
@@ -69,6 +69,8 @@ License: ImageMagick
Url: http://www.imagemagick.org/
Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%{VER}-%{Patchlevel}.tar.xz
+Patch0: https://github.com/ImageMagick/ImageMagick/commit/14d2cea959977a84f0eb65d7b270cf7007375df1.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel
BuildRequires: libtiff-devel, giflib-devel, zlib-devel
@@ -281,6 +283,8 @@ however.
%prep
%setup -q -n %{libname}-%{VER}-%{Patchlevel}
+%patch0 -p1
+
# for %%doc
mkdir Magick++/examples
cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
@@ -498,6 +502,7 @@ rm -rf %{buildroot}
- update to version 7.0.3 patchlevel 3
- open https://github.com/ImageMagick/ImageMagick/issues/284
3 failed tests
+- add upstream patch for #284
* Mon Oct 3 2016 Remi Collet <remi@remirepo.net> - 7.0.3.2-1
- update to version 7.0.3 patchlevel 2