From 02b0170cf9b47f0b6ff533d7480d32a31c5ec193 Mon Sep 17 00:00:00 2001 From: Cristy Date: Wed, 21 Dec 2016 16:50:36 -0500 Subject: [PATCH] ... --- MagickCore/image.c | 5 +++++ configure | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/MagickCore/image.c b/MagickCore/image.c index 37a74d95a..b64839519 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -528,6 +528,7 @@ MagickExport Image *AppendImages(const Image *images, (void) SetImageColorspace(append_image,sRGBColorspace,exception); append_image->depth=depth; append_image->alpha_trait=alpha_trait; + append_image->page=images->page; (void) SetImageBackgroundColor(append_image,exception); status=MagickTrue; x_offset=0; @@ -907,10 +908,14 @@ MagickExport Image *CloneImage(const Image *image,const size_t columns, if (image->columns != 0) scale=(double) columns/(double) image->columns; clone_image->page.width=(size_t) floor(scale*image->page.width+0.5); + clone_image->page.x=(ssize_t) ceil(scale*image->page.x-0.5); + clone_image->tile_offset.x=(ssize_t) ceil(scale*image->tile_offset.x-0.5); scale=1.0; if (image->rows != 0) scale=(double) rows/(double) image->rows; clone_image->page.height=(size_t) floor(scale*image->page.height+0.5); + clone_image->page.y=(ssize_t) ceil(scale*image->page.y-0.5); + clone_image->tile_offset.y=(ssize_t) ceil(scale*image->tile_offset.y-0.5); clone_image->cache=ClonePixelCache(image->cache); if (SetImageExtent(clone_image,columns,rows,exception) == MagickFalse) clone_image=DestroyImage(clone_image); diff --git a/configure b/configure index 5814ed63b..95869e00d 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.4-0. +# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.4-1. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ImageMagick' PACKAGE_TARNAME='ImageMagick' -PACKAGE_VERSION='7.0.4-0' -PACKAGE_STRING='ImageMagick 7.0.4-0' +PACKAGE_VERSION='7.0.4-1' +PACKAGE_STRING='ImageMagick 7.0.4-1' PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues' PACKAGE_URL='https://www.imagemagick.org' @@ -1818,7 +1818,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.4-0 to adapt to many kinds of systems. +\`configure' configures ImageMagick 7.0.4-1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1893,7 +1893,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ImageMagick 7.0.4-0:";; + short | recursive ) echo "Configuration of ImageMagick 7.0.4-1:";; esac cat <<\_ACEOF @@ -2167,7 +2167,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ImageMagick configure 7.0.4-0 +ImageMagick configure 7.0.4-1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3218,7 +3218,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.4-0, which was +It was created by ImageMagick $as_me 7.0.4-1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4204,7 +4204,7 @@ fi # Define the identity of the package. PACKAGE='ImageMagick' - VERSION='7.0.4-0' + VERSION='7.0.4-1' cat >>confdefs.h <<_ACEOF @@ -4514,11 +4514,11 @@ MAGICK_MINOR_VERSION=0 MAGICK_MICRO_VERSION=4 -MAGICK_PATCHLEVEL_VERSION=0 +MAGICK_PATCHLEVEL_VERSION=1 -MAGICK_VERSION=7.0.4-0 +MAGICK_VERSION=7.0.4-1 -MAGICK_GIT_REVISION=19193:ec42b07:20161211 +MAGICK_GIT_REVISION=19238:cca1301:20161221 # Substitute library versioning @@ -38204,7 +38204,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.4-0, which was +This file was extended by ImageMagick $as_me 7.0.4-1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -38271,7 +38271,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.4-0 +ImageMagick config.status 7.0.4-1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- 2.40.0