From: anthony Date: Thu, 20 Oct 2011 06:33:52 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6780 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8db8ec2efca8d5eed514b74213e9614633fb4603;p=imagemagick --- diff --git a/coders/ttf.c b/coders/ttf.c index ca3ab8911..c655ea31c 100644 --- a/coders/ttf.c +++ b/coders/ttf.c @@ -278,7 +278,7 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) ConcatenateString(&draw_info->primitive,buffer); y+=12*(ssize_t) MultilineCensus((char *) Text); /* FUTURE: A setting to specify the text to use */ - for (i=5; i <= 72; ) + for (i=4; i <= 72; ) { y += (i+2>12) ? i+2 : 12; /* line spacing */ ConcatenateString(&draw_info->primitive," font-size 12\n"); @@ -291,12 +291,16 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) FormatLocaleString(buffer,MaxTextExtent," text 50,%g '%s'\n", (double) y, Phrase); ConcatenateString(&draw_info->primitive,buffer); - if (i < 12) + if (i < 14) i+=1; + else if (i < 20) + i+=2; else if (i < 24) i+=4; - else + else if ( i < 48 ) i+=12; + else + i+=24; } ConcatenateString(&draw_info->primitive,"pop graphic-context"); (void) DrawImage(image,draw_info,exception);