From b94e76ec47a892409e66aee93716d4fa9fecdc24 Mon Sep 17 00:00:00 2001 From: Cristy Date: Thu, 22 Jun 2017 19:18:20 -0400 Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/pull/516 --- coders/rle.c | 4 ++-- configure | 3 ++- configure.ac | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/coders/rle.c b/coders/rle.c index 9a31baa54..6b513daab 100644 --- a/coders/rle.c +++ b/coders/rle.c @@ -278,12 +278,12 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) p=colormap; for (i=0; i < (ssize_t) number_colormaps; i++) for (x=0; x < (ssize_t) map_length; x++) - { + { *p++=(unsigned char) ScaleQuantumToChar(ScaleShortToQuantum( ReadBlobLSBShort(image))); if (EOFBlob(image) != MagickFalse) ThrowRLEException(CorruptImageError,"UnexpectedEndOfFile"); - } + } } if ((flags & 0x08) != 0) { diff --git a/configure b/configure index cb5f7d3af..9c5aac9d3 100755 --- a/configure +++ b/configure @@ -4519,7 +4519,7 @@ MAGICK_PATCHLEVEL_VERSION=1 MAGICK_VERSION=7.0.6-1 -MAGICK_GIT_REVISION=20195:9caa8b0:20170611 +MAGICK_GIT_REVISION=20211:8ca3583:20170622 # Substitute library versioning @@ -30828,6 +30828,7 @@ if test "$have_zlib" = 'yes'; then $as_echo "#define ZLIB_DELEGATE 1" >>confdefs.h CFLAGS="$ZLIB_CFLAGS $CFLAGS" + LIBS="$ZLIB_LIBS $LIBS" fi if test "$have_zlib" = 'yes'; then diff --git a/configure.ac b/configure.ac index 8342c27f7..e3ef9eb3d 100644 --- a/configure.ac +++ b/configure.ac @@ -1673,6 +1673,7 @@ fi if test "$have_zlib" = 'yes'; then AC_DEFINE(ZLIB_DELEGATE,1,Define if you have ZLIB library) CFLAGS="$ZLIB_CFLAGS $CFLAGS" + LIBS="$ZLIB_LIBS $LIBS" fi AM_CONDITIONAL(ZLIB_DELEGATE, test "$have_zlib" = 'yes') -- 2.50.1