From 0ba0110feb9ece2ce1d8632c9931500a3ca02c69 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 6 Nov 2010 18:09:58 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- coders/meta.c | 4 +++- config/configure.xml | 2 +- libtool | 2 +- magick/version.h | 2 +- version.sh | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index fe16aee64..86af5cd89 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VERSION 6.6.5 -%global Patchlevel 7 +%global Patchlevel 6 Name: ImageMagick Version: %{VERSION} diff --git a/coders/meta.c b/coders/meta.c index b5bafa87f..b8dec14eb 100644 --- a/coders/meta.c +++ b/coders/meta.c @@ -2280,7 +2280,9 @@ static MagickBooleanType WriteMETAImage(const ImageInfo *image_info, unsigned char *info; - profile=GetImageProfile(image,"8bim"); + profile=GetImageProfile(image,"iptc"); + if (profile == (StringInfo *) NULL) + profile=GetImageProfile(image,"8bim"); if (profile == (StringInfo *) NULL) ThrowWriterException(CoderError,"No8BIMDataIsAvailable"); status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception); diff --git a/config/configure.xml b/config/configure.xml index c9c193cfe..142899675 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/libtool b/libtool index 62fe88f19..67d8d9a57 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.5-7 +# Generated automatically by config.status (ImageMagick) 6.6.5-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 3378ad5ff..30dcf3f42 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ extern "C" { #define MagickLibVersion 0x665 #define MagickLibVersionText "6.6.5" #define MagickLibVersionNumber 4,0,0 -#define MagickLibAddendum "-7" +#define MagickLibAddendum "-6" #define MagickLibInterface 4 #define MagickLibMinInterface 4 #define MagickReleaseDate "2010-11-06" diff --git a/version.sh b/version.sh index fdcf0d059..e7c54af76 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.5' PACKAGE_LIB_VERSION="0x665" -PACKAGE_RELEASE="7" +PACKAGE_RELEASE="6" PACKAGE_LIB_VERSION_NUMBER="6,6,5,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" -- 2.40.0