From: cristy Date: Thu, 22 Apr 2010 02:24:11 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9614 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ac8b3303196ef8f76c38ec08cdbafe15b53bc10;p=imagemagick --- diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index ca2c05aa6..85be65288 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -285,7 +285,8 @@ static struct {"fill-pattern", ImageReference}, {"stroke-pattern", ImageReference}, {"tile", ImageReference}, {"kerning", RealReference}, {"interline-spacing", RealReference}, - {"interword-spacing", RealReference} } }, + {"interword-spacing", RealReference}, + {"direction", MagickDirectionOptions} } }, { "ColorFloodfill", { {"geometry", StringReference}, {"x", IntegerReference}, {"y", IntegerReference}, {"fill", StringReference}, {"bordercolor", StringReference}, @@ -8077,6 +8078,9 @@ Mogrify(ref,...) draw_info->interline_spacing=argument_list[30].real_reference; if (attribute_flag[31] != 0) draw_info->interword_spacing=argument_list[31].real_reference; + if (attribute_flag[32] != 0) + draw_info->direction=(DirectionType) + argument_list[32].long_reference; (void) AnnotateImage(image,draw_info); draw_info=DestroyDrawInfo(draw_info); break; diff --git a/magick/draw.c b/magick/draw.c index e4374c5c2..981ac11ff 100644 --- a/magick/draw.c +++ b/magick/draw.c @@ -4775,7 +4775,7 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info) option=GetImageOption(clone_info,"interline-spacing"); if (option != (const char *) NULL) draw_info->interline_spacing=StringToDouble(option); - draw_info->direction=1.0; + draw_info->direction=UndefinedDirection; option=GetImageOption(clone_info,"interword-spacing"); if (option != (const char *) NULL) draw_info->interword_spacing=StringToDouble(option); diff --git a/magick/draw.h b/magick/draw.h index 9b39ebee7..1880a46a8 100644 --- a/magick/draw.h +++ b/magick/draw.h @@ -326,7 +326,9 @@ typedef struct _DrawInfo double kerning, interword_spacing, - interline_spacing, + interline_spacing; + + DirectionType direction; } DrawInfo;