Skip to content

Commit 6b8bb85

Browse files
author
Cristy
committed
https://github.com/ImageMagick/ImageMagick/pull/2195
1 parent 77a5876 commit 6b8bb85

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

magick/annotate.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,10 @@ MagickExport MagickBooleanType AnnotateImage(Image *image,
324324
(void) CloneString(&annotate->text,textlist[i]);
325325
if ((metrics.width == 0) || (annotate->gravity != NorthWestGravity))
326326
(void) GetTypeMetrics(image,annotate,&metrics);
327-
height=(ssize_t) (metrics.ascent-metrics.descent+
328-
draw_info->interline_spacing+0.5);
327+
height=(size_t) floor(metrics.ascent-metrics.descent+0.5);
328+
if (height == 0)
329+
height=draw_info->pointsize;
330+
height+=(size_t) floor(draw_info->interline_spacing+0.5);
329331
switch (annotate->gravity)
330332
{
331333
case UndefinedGravity:

magick/draw.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5781,7 +5781,6 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
57815781
draw_info->pointsize=12.0;
57825782
if (fabs(clone_info->pointsize) >= MagickEpsilon)
57835783
draw_info->pointsize=clone_info->pointsize;
5784-
draw_info->interline_spacing=draw_info->pointsize;
57855784
draw_info->undercolor.opacity=(Quantum) TransparentOpacity;
57865785
draw_info->border_color=clone_info->border_color;
57875786
draw_info->compose=OverCompositeOp;

0 commit comments

Comments
 (0)