From: cristy Date: Sat, 19 Dec 2009 01:15:55 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10255 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4f75d7faa2cd000e7981b6ce21bf6a42d74ab6fd;p=imagemagick --- diff --git a/ChangeLog b/ChangeLog index 04837b3bc..bcfa980f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2009-12-18 6.5.8-6 Cristy * Off by 1 error when allocating the dash-pattern array in PerlMagick. + * The -gaussian-blur over blurred the opacity channel (reference + http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=15218). 2009-12-13 6.5.8-5 Cristy * Declare InverseFourierTransformImage in Magick++/Include.h. diff --git a/ImageMagick.spec b/ImageMagick.spec index 620b0e60f..7d9165e1c 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.5.8 -%define Patchlevel 8 +%define Patchlevel 7 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index 9addf9c14..2c64276aa 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/libtool b/libtool index d8f4dc929..acd90af0e 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 6.5.8-8 +# Generated automatically by config.status (ImageMagick) 6.5.8-7 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/magick/effect.c b/magick/effect.c index 550afe45f..d03a7d4ee 100644 --- a/magick/effect.c +++ b/magick/effect.c @@ -1536,7 +1536,6 @@ MagickExport Image *ConvolveImageChannel(const Image *image, pixel.red+=(*k)*alpha*kernel_pixels[u].red; pixel.green+=(*k)*alpha*kernel_pixels[u].green; pixel.blue+=(*k)*alpha*kernel_pixels[u].blue; - pixel.opacity+=(*k)*kernel_pixels[u].opacity; gamma+=(*k)*alpha; k++; } diff --git a/magick/version.h b/magick/version.h index ba7de2ec2..494b7921a 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ extern "C" { #define MagickLibVersion 0x658 #define MagickLibVersionText "6.5.8" #define MagickLibVersionNumber 2,0,1 -#define MagickLibSubversion "-8" +#define MagickLibSubversion "-7" #define MagickReleaseDate "2009-12-18" #define MagickChangeDate "20091218" #define MagickAuthoritativeURL "http://www.imagemagick.org" diff --git a/version.sh b/version.sh index 47a1ab96b..2d6efab86 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.5.8' PACKAGE_LIB_VERSION="0x658" -PACKAGE_RELEASE="8" +PACKAGE_RELEASE="7" PACKAGE_LIB_VERSION_NUMBER="6,5,8,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"