fix ImageMagick#85 regression in DrawSetTextInterlineSpacing

revert 77849ee revert 147e715 also fix ImageMagick/ImageMagick#2178
remicollet · Jun 24, 2020 · c99f35a · c99f35a
1 parent 147e715
commit c99f35a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/magick/annotate.c b/magick/annotate.c
@@ -324,11 +324,8 @@ MagickExport MagickBooleanType AnnotateImage(Image *image,
     (void) CloneString(&annotate->text,textlist[i]);
     if ((metrics.width == 0) || (annotate->gravity != NorthWestGravity))
       (void) GetTypeMetrics(image,annotate,&metrics);
-    height=(size_t) ceil(metrics.ascent-metrics.descent+
-      draw_info->interline_spacing-0.5);
-    if (height == 0)
-      height=(size_t) ceil(draw_info->pointsize+draw_info->interline_spacing-
-        0.5);
+    height=(ssize_t) (metrics.ascent-metrics.descent+
+      draw_info->interline_spacing+0.5);
     switch (annotate->gravity)
     {
       case UndefinedGravity:

diff --git a/magick/draw.c b/magick/draw.c
@@ -5781,6 +5781,7 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
   draw_info->pointsize=12.0;
   if (fabs(clone_info->pointsize) >= MagickEpsilon)
     draw_info->pointsize=clone_info->pointsize;
+  draw_info->interline_spacing=draw_info->pointsize;
   draw_info->undercolor.opacity=(Quantum) TransparentOpacity;
   draw_info->border_color=clone_info->border_color;
   draw_info->compose=OverCompositeOp;