https://github.com/ImageMagick/ImageMagick/pull/516

diff --git a/coders/rle.c b/coders/rle.c
index 9a31baa54339a7b5e17f80f4a6ef9fbdc7416a83..6b513daaba632957d92ad90403321900a02d6868 100644 (file)
--- 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 cb5f7d3af1b93a69fba13e4b1170dd892c3780cf..9c5aac9d32e2e4e251c9bf04296321cb67525bdb 100755 (executable)
--- 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 8342c27f7b2372db679b63e441707cce4a489a69..e3ef9eb3d557f88183d0706b7956722a7283a4ff 100644 (file)
--- 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')