Skip to content

Commit

Permalink
...
Browse files Browse the repository at this point in the history
  • Loading branch information
Cristy committed Jul 22, 2017
1 parent bbd2d43 commit 58ab276
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
1 change: 1 addition & 0 deletions coders/png.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 13 additions & 13 deletions configure
Original file line number Diff line number Diff line change
@@ -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 <https://github.com/ImageMagick/ImageMagick/issues>.
#
Expand Down Expand Up @@ -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'

Expand Down Expand Up @@ -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]...

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 $@
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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\\"

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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'"]))
Expand Down
2 changes: 1 addition & 1 deletion version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down

0 comments on commit 58ab276

Please sign in to comment.