From 58845e32a1860fdc24b554aae5b3b7bebeb2b535 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 27 Mar 2012 15:44:05 +0000 Subject: [PATCH] --- MagickCore/version.h | 4 ++-- coders/pango.c | 34 +++++++++++++++++++++++++++++----- config/ImageMagick.rdf | 4 ++-- config/configure.xml | 4 ++-- configure | 2 +- 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/MagickCore/version.h b/MagickCore/version.h index 8b144bb40..979fca46c 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC" -#define MagickSVNRevision "7227" +#define MagickSVNRevision "7235" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 7 #define MagickLibMinInterface 7 -#define MagickReleaseDate "2012-03-26" +#define MagickReleaseDate "2012-03-27" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/coders/pango.c b/coders/pango.c index 5752790c5..c02c50f1d 100644 --- a/coders/pango.c +++ b/coders/pango.c @@ -214,11 +214,35 @@ static Image *ReadPANGOImage(const ImageInfo *image_info, RightToLeftDirection ? PANGO_DIRECTION_RTL : PANGO_DIRECTION_LTR); switch (draw_info->gravity) { - case NorthGravity: gravity=PANGO_GRAVITY_NORTH; break; - case WestGravity: gravity=PANGO_GRAVITY_WEST; break; - case EastGravity: gravity=PANGO_GRAVITY_EAST; break; - case SouthGravity: gravity=PANGO_GRAVITY_SOUTH; break; - default: gravity=PANGO_GRAVITY_AUTO; break; + case NorthGravity: + { + gravity=PANGO_GRAVITY_NORTH; + break; + } + case NorthWestGravity: + case WestGravity: + case SouthWestGravity: + { + gravity=PANGO_GRAVITY_WEST; + break; + } + case NorthEastGravity: + case EastGravity: + case SouthEastGravity: + { + gravity=PANGO_GRAVITY_EAST; + break; + } + case SouthGravity: + { + gravity=PANGO_GRAVITY_SOUTH; + break; + } + default: + { + gravity=PANGO_GRAVITY_AUTO; + break; + } } pango_context_set_base_gravity(context,gravity); option=GetImageOption(image_info,"pango:gravity-hint"); diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index 8e853e943..12f0bbdec 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-03-26 + 2012-03-27 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves. @@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line stable - 2012-03-26 + 2012-03-27 7.0.0 diff --git a/config/configure.xml b/config/configure.xml index 248cedb45..a7e164979 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index 4bc0bf2c7..3382e6358 100755 --- a/configure +++ b/configure @@ -3620,7 +3620,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE -MAGICK_SVN_REVISION=7227 +MAGICK_SVN_REVISION=7235 -- 2.40.0