From 58ab276e511b49ee6a25cb7b69784319f50b1989 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sat, 22 Jul 2017 15:01:00 -0400 Subject: [PATCH] ... --- coders/png.c | 1 + configure | 26 +++++++++++++------------- configure.ac | 2 +- version.sh | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/coders/png.c b/coders/png.c index 3d33163ce..9818312e5 100644 --- a/coders/png.c +++ b/coders/png.c @@ -3254,6 +3254,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, status=SetImageExtent(image,image->columns,image->rows,exception); if (status == MagickFalse) { + png_destroy_read_struct(&ping,&ping_info,&end_info); #ifdef IMPNG_SETJMP_NOT_THREAD_SAFE UnlockSemaphoreInfo(ping_semaphore); #endif diff --git a/configure b/configure index 8e2e476ff..1e2ac0c0b 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.6-2. +# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.6-3. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ImageMagick' PACKAGE_TARNAME='ImageMagick' -PACKAGE_VERSION='7.0.6-2' -PACKAGE_STRING='ImageMagick 7.0.6-2' +PACKAGE_VERSION='7.0.6-3' +PACKAGE_STRING='ImageMagick 7.0.6-3' PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues' PACKAGE_URL='https://www.imagemagick.org' @@ -1826,7 +1826,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ImageMagick 7.0.6-2 to adapt to many kinds of systems. +\`configure' configures ImageMagick 7.0.6-3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1901,7 +1901,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ImageMagick 7.0.6-2:";; + short | recursive ) echo "Configuration of ImageMagick 7.0.6-3:";; esac cat <<\_ACEOF @@ -2179,7 +2179,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ImageMagick configure 7.0.6-2 +ImageMagick configure 7.0.6-3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3230,7 +3230,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ImageMagick $as_me 7.0.6-2, which was +It was created by ImageMagick $as_me 7.0.6-3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4216,7 +4216,7 @@ fi # Define the identity of the package. PACKAGE='ImageMagick' - VERSION='7.0.6-2' + VERSION='7.0.6-3' cat >>confdefs.h <<_ACEOF @@ -4526,11 +4526,11 @@ MAGICK_MINOR_VERSION=0 MAGICK_MICRO_VERSION=6 -MAGICK_PATCHLEVEL_VERSION=2 +MAGICK_PATCHLEVEL_VERSION=3 -MAGICK_VERSION=7.0.6-2 +MAGICK_VERSION=7.0.6-3 -MAGICK_GIT_REVISION=20502:955bd1008:20170718 +MAGICK_GIT_REVISION=20550:bbd2d43ed:20170722 # Substitute library versioning @@ -38589,7 +38589,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ImageMagick $as_me 7.0.6-2, which was +This file was extended by ImageMagick $as_me 7.0.6-3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -38656,7 +38656,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ImageMagick config.status 7.0.6-2 +ImageMagick config.status 7.0.6-3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index d11a107ff..2100828ff 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ AC_PREREQ(2.69) m4_define([magick_major_version], [7]) m4_define([magick_minor_version], [0]) m4_define([magick_micro_version], [6]) -m4_define([magick_patchlevel_version], [2]) +m4_define([magick_patchlevel_version], [3]) m4_define([magick_version], [magick_major_version.magick_minor_version.magick_micro_version-magick_patchlevel_version]) m4_define([magick_git_revision], esyscmd([sh -c "(gitversion.sh .) | tr -d '\n'"])) diff --git a/version.sh b/version.sh index d62fa929e..df25ff23c 100644 --- a/version.sh +++ b/version.sh @@ -18,7 +18,7 @@ PACKAGE_CHANGE_DATE=`awk '/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ { print PACKAGE_VERSION='7.0.6' PACKAGE_PERL_VERSION='7.06' PACKAGE_LIB_VERSION="0x706" -PACKAGE_RELEASE="2" +PACKAGE_RELEASE="3" PACKAGE_LIB_VERSION_NUMBER="7,0,6,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE_RAW=`date +%F` PACKAGE_RELEASE_DATE_REPRODUCIBLE="${PACKAGE_CHANGE_DATE}" -- 2.50.1