Changeset 3 for ImageMagick/trunk/magick/annotate.c

Timestamp:

09/07/09 14:45:48 (6 months ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/magick/annotate.c (modified) (4 diffs)

ImageMagick/trunk/magick/annotate.c

@@ -165 +165 @@
     **textlist;
 
+  double
+    height;
+
   DrawInfo
     *annotate,
@@ -191 +194 @@
 
   unsigned long
-    height,
     number_lines;
 
@@ -234 +236 @@
     (void) CloneString(&annotate->text,textlist[i]);
     (void) GetTypeMetrics(image,annotate,&metrics);
-    height=(unsigned long) (metrics.ascent-metrics.descent+0.5);
+    height=metrics.height;
+    if (draw_info->interline_spacing != 0.0)
+      height+=draw_info->interline_spacing;
     switch (annotate->gravity)
     {
@@ -394 +398 @@
         undercolor_info->affine.ty=offset.y-draw_info->affine.sy*metrics.ascent;
         (void) FormatMagickString(primitive,MaxTextExtent,
-          "rectangle 0,0 %g,%ld",metrics.origin.x,height);
+          "rectangle 0,0 %g,%g",metrics.origin.x,height);
         (void) CloneString(&undercolor_info->primitive,primitive);
         (void) DrawImage(image,undercolor_info);