From cc7232ceee57a9d6ab16f8c5695cf05cc8449d24 Mon Sep 17 00:00:00 2001 From: Cristy Date: Wed, 19 Dec 2018 10:20:08 -0500 Subject: [PATCH] ... --- coders/caption.c | 2 +- configure | 26 +++++++++++++------------- configure.ac | 2 +- version.sh | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/coders/caption.c b/coders/caption.c index 10417aef2..759ef5cef 100644 --- a/coders/caption.c +++ b/coders/caption.c @@ -136,7 +136,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info, image=AcquireImage(image_info,exception); (void) ResetImagePage(image,"0x0+0+0"); if ((image->columns != 0) && (image->rows != 0)) - (void) SetImageBackgroundColor(image); + (void) SetImageBackgroundColor(image,exception); /* Format caption. */ diff --git a/configure b/configure index 060408c23..8e7d582ff 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.8-19. +# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.8-18. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ImageMagick' PACKAGE_TARNAME='ImageMagick' -PACKAGE_VERSION='7.0.8-19' -PACKAGE_STRING='ImageMagick 7.0.8-19' +PACKAGE_VERSION='7.0.8-18' +PACKAGE_STRING='ImageMagick 7.0.8-18' PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues' PACKAGE_URL='https://imagemagick.org' @@ -1852,7 +1852,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.8-19 to adapt to many kinds of systems. +\`configure' configures ImageMagick 7.0.8-18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1927,7 +1927,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ImageMagick 7.0.8-19:";; + short | recursive ) echo "Configuration of ImageMagick 7.0.8-18:";; esac cat <<\_ACEOF @@ -2219,7 +2219,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ImageMagick configure 7.0.8-19 +ImageMagick configure 7.0.8-18 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3270,7 +3270,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.8-19, which was +It was created by ImageMagick $as_me 7.0.8-18, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4256,7 +4256,7 @@ fi # Define the identity of the package. PACKAGE='ImageMagick' - VERSION='7.0.8-19' + VERSION='7.0.8-18' cat >>confdefs.h <<_ACEOF @@ -4566,11 +4566,11 @@ MAGICK_MINOR_VERSION=0 MAGICK_MICRO_VERSION=8 -MAGICK_PATCHLEVEL_VERSION=19 +MAGICK_PATCHLEVEL_VERSION=18 -MAGICK_VERSION=7.0.8-19 +MAGICK_VERSION=7.0.8-18 -MAGICK_GIT_REVISION=15150:74d208bfd:20181219 +MAGICK_GIT_REVISION=15151:c807b69de:20181219 # Substitute library versioning @@ -37772,7 +37772,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.8-19, which was +This file was extended by ImageMagick $as_me 7.0.8-18, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -37839,7 +37839,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.8-19 +ImageMagick config.status 7.0.8-18 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 635a8892d..6014c979a 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], [8]) -m4_define([magick_patchlevel_version], [19]) +m4_define([magick_patchlevel_version], [18]) 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 .) | awk '{ print \$1 }' | tr -d '\n'"])) diff --git a/version.sh b/version.sh index 53e7e68c9..e7c1a24de 100644 --- a/version.sh +++ b/version.sh @@ -19,7 +19,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.8' PACKAGE_PERL_VERSION='7.0.8' PACKAGE_LIB_VERSION="0x708" -PACKAGE_RELEASE="19" +PACKAGE_RELEASE="18" PACKAGE_LIB_VERSION_NUMBER="7,0,8,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE_RAW=`date +%F` PACKAGE_RELEASE_DATE_REPRODUCIBLE="${PACKAGE_CHANGE_DATE}" -- 2.40.0