From 1652a65fde8a955d3a9e55e5d4e5b136f6625691 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 24 Apr 2011 14:34:50 +0000 Subject: [PATCH] --- ChangeLog | 3 +++ ImageMagick.spec | 2 +- coders/xtrn.c | 4 ++-- config/configure.xml | 2 +- libtool | 2 +- magick/version.h | 4 ++-- version.sh | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2479ec02a..a3e8a79f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2011-04-24 6.6.9-6 Cristy + * New version 6.6.9-6. + 2011-04-21 6.6.9-6 Anthony Thyssen * Make filter:blur define a multiplicative adjustment of filter settings rather than a complete override of those settings. diff --git a/ImageMagick.spec b/ImageMagick.spec index f4aad1ed4..aca3344be 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VERSION 6.6.9 -%global Patchlevel 7 +%global Patchlevel 6 Name: ImageMagick Version: %{VERSION} diff --git a/coders/xtrn.c b/coders/xtrn.c index 6c0d5f7b0..dab0948cd 100644 --- a/coders/xtrn.c +++ b/coders/xtrn.c @@ -482,7 +482,7 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image filename[MaxTextExtent]; size_t - *blob_length; + blob_length; unsigned char *blob_data; @@ -505,7 +505,7 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image blob_data=ImageToBlob(clone_info,image,&blob_length, &image->exception); if (blob_data == (unsigned char *) NULL) - status=False; + status=MagickFalse; else SafeArrayFifo(image,blob_data,blob_length); if (status == MagickFalse) diff --git a/config/configure.xml b/config/configure.xml index 282c5a16c..b74918b10 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -9,7 +9,7 @@ - + diff --git a/libtool b/libtool index 7b4dd920d..94276c64b 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.6.9-7 +# Generated automatically by config.status (ImageMagick) 6.6.9-6 # 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/version.h b/magick/version.h index 8f4e247fb..746746438 100644 --- a/magick/version.h +++ b/magick/version.h @@ -31,11 +31,11 @@ extern "C" { #define MagickLibVersion 0x669 #define MagickLibVersionText "6.6.9" #define MagickLibVersionNumber 4,0,1 -#define MagickLibAddendum "-7" +#define MagickLibAddendum "-6" #define MagickLibInterface 4 #define MagickLibMinInterface 4 #define MagickReleaseDate "2011-04-24" -#define MagickChangeDate "20110421" +#define MagickChangeDate "20110424" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) #define MagickOpenMPFeature "OpenMP " diff --git a/version.sh b/version.sh index a6c6cfd71..57197d01b 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.6.9' PACKAGE_LIB_VERSION="0x669" -PACKAGE_RELEASE="7" +PACKAGE_RELEASE="6" PACKAGE_LIB_VERSION_NUMBER="6,6,9,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" -- 2.40.0