]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authoranthony <anthony@git.imagemagick.org>
Thu, 20 Oct 2011 06:33:52 +0000 (06:33 +0000)
committeranthony <anthony@git.imagemagick.org>
Thu, 20 Oct 2011 06:33:52 +0000 (06:33 +0000)
coders/ttf.c

index ca3ab89119347b256a0ae875ccdd0c780074dcd2..c655ea31c3a343306e72eb4bb4741534b0052f36 100644 (file)
@@ -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);