From ca0dd94207762a84eb14cd097296584d6d1e4f48 Mon Sep 17 00:00:00 2001 From: Cristy Date: Tue, 20 Sep 2016 20:48:15 -0400 Subject: [PATCH] Bump release --- MagickCore/draw.c | 7 +------ coders/mvg.c | 1 + coders/svg.c | 6 +++--- configure | 26 +++++++++++++------------- configure.ac | 2 +- version.sh | 2 +- 6 files changed, 20 insertions(+), 24 deletions(-) diff --git a/MagickCore/draw.c b/MagickCore/draw.c index c14781851..42f8fcbed 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -1737,9 +1737,6 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, StopInfo *stops; - /* - Ensure the annotation info is valid. - */ assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); if (image->debug != MagickFalse) @@ -1760,15 +1757,13 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, if (primitive == (char *) NULL) return(MagickFalse); primitive_extent=(double) strlen(primitive); - (void) SetImageArtifact(image,"MVG",primitive); n=0; number_stops=0; stops=(StopInfo *) NULL; /* Allocate primitive info memory. */ - graphic_context=(DrawInfo **) AcquireMagickMemory( - sizeof(*graphic_context)); + graphic_context=(DrawInfo **) AcquireMagickMemory(sizeof(*graphic_context)); if (graphic_context == (DrawInfo **) NULL) { primitive=DestroyString(primitive); diff --git a/coders/mvg.c b/coders/mvg.c index 30624636f..5726c97bd 100644 --- a/coders/mvg.c +++ b/coders/mvg.c @@ -215,6 +215,7 @@ static Image *ReadMVGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (draw_info->primitive == (char *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); (void) DrawImage(image,draw_info,exception); + (void) SetImageArtifact(image,"MVG",draw_info->primitive); draw_info=DestroyDrawInfo(draw_info); (void) CloseBlob(image); return(GetFirstImageInList(image)); diff --git a/coders/svg.c b/coders/svg.c index 49da9367c..16b37eea6 100644 --- a/coders/svg.c +++ b/coders/svg.c @@ -2883,9 +2883,9 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) 100.0*QuantumScale*image->background_color.blue); (void) FormatLocaleString(opacity,MagickPathExtent,"%.20g", QuantumScale*image->background_color.alpha); - (void) FormatLocaleString(command,MagickPathExtent,GetDelegateCommands( - delegate_info),input_filename,output_filename,density,background, - opacity,unique); + (void) FormatLocaleString(command,MagickPathExtent, + GetDelegateCommands(delegate_info),input_filename,output_filename, + density,background,opacity,unique); density=DestroyString(density); status=ExternalDelegateCommand(MagickFalse,image_info->verbose, command,(char *) NULL,exception); diff --git a/configure b/configure index 5040f72c5..58d2a4dd6 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.3-1. +# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.3-2. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ImageMagick' PACKAGE_TARNAME='ImageMagick' -PACKAGE_VERSION='7.0.3-1' -PACKAGE_STRING='ImageMagick 7.0.3-1' +PACKAGE_VERSION='7.0.3-2' +PACKAGE_STRING='ImageMagick 7.0.3-2' PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues' PACKAGE_URL='http://www.imagemagick.org' @@ -1817,7 +1817,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.3-1 to adapt to many kinds of systems. +\`configure' configures ImageMagick 7.0.3-2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1892,7 +1892,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ImageMagick 7.0.3-1:";; + short | recursive ) echo "Configuration of ImageMagick 7.0.3-2:";; esac cat <<\_ACEOF @@ -2166,7 +2166,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ImageMagick configure 7.0.3-1 +ImageMagick configure 7.0.3-2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3217,7 +3217,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.3-1, which was +It was created by ImageMagick $as_me 7.0.3-2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4203,7 +4203,7 @@ fi # Define the identity of the package. PACKAGE='ImageMagick' - VERSION='7.0.3-1' + VERSION='7.0.3-2' cat >>confdefs.h <<_ACEOF @@ -4513,11 +4513,11 @@ MAGICK_MINOR_VERSION=0 MAGICK_MICRO_VERSION=3 -MAGICK_PATCHLEVEL_VERSION=1 +MAGICK_PATCHLEVEL_VERSION=2 -MAGICK_VERSION=7.0.3-1 +MAGICK_VERSION=7.0.3-2 -MAGICK_GIT_REVISION=18787:faccddc:20160905 +MAGICK_GIT_REVISION=18852:3448b33:20160920 # Substitute library versioning @@ -38201,7 +38201,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.3-1, which was +This file was extended by ImageMagick $as_me 7.0.3-2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -38268,7 +38268,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.3-1 +ImageMagick config.status 7.0.3-2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f5b65afb0..d7db60eb5 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], [3]) -m4_define([magick_patchlevel_version], [1]) +m4_define([magick_patchlevel_version], [2]) 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 .) | tr -d '\n'"])) diff --git a/version.sh b/version.sh index 8a3e76da1..d7f94f389 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.3' PACKAGE_PERL_VERSION='7.03' PACKAGE_LIB_VERSION="0x703" -PACKAGE_RELEASE="1" +PACKAGE_RELEASE="2" PACKAGE_LIB_VERSION_NUMBER="7,0,3,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE_RAW=`date +%F` PACKAGE_RELEASE_DATE_REPRODUCIBLE="${PACKAGE_CHANGE_DATE}" -- 2.40.0