1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
From f3381cbb2f02d6627f6bc4f21c8886a57102c8b5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 24 Jun 2020 11:16:22 +0200
Subject: [PATCH 2/3] Revert
"https://github.com/ImageMagick/ImageMagick/issues/2178"
This reverts commit d91c43f3b92c1bf33e38bf54aee5c6303d54ebb4.
---
MagickCore/annotate.c | 6 ++----
coders/caption.c | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 3c9889a1c4..3c649ae346 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -335,10 +335,8 @@ MagickExport MagickBooleanType AnnotateImage(Image *image,
(void) CloneString(&annotate->text,textlist[i]);
if ((metrics.width == 0) || (annotate->gravity != NorthWestGravity))
(void) GetTypeMetrics(image,annotate,&metrics,exception);
- height=(size_t) ceil(metrics.ascent-metrics.descent+
- draw_info->interline_spacing-0.5);
- if (height == 0)
- height=(size_t) draw_info->pointsize;
+ height=(ssize_t) (metrics.ascent-metrics.descent+
+ draw_info->interline_spacing+0.5);
switch (annotate->gravity)
{
case UndefinedGravity:
diff --git a/coders/caption.c b/coders/caption.c
index c7fa2a5074..44f3b7a4a4 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -228,7 +228,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
option=GetImageOption(image_info,"caption:max-pointsize");
if (option != (const char*) NULL)
{
- high=StringToDouble(option,(char **) NULL);
+ high=StringToDouble(option,(char**) NULL);
if (high < 1.0)
high=1.0;
high+=1.0;
From 8a2e5319b5d75775b2afdcb24c985929ac1652d7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 24 Jun 2020 11:24:18 +0200
Subject: [PATCH 3/3] Fix regression in DrawSetTextInterlineSpacing
---
MagickCore/draw.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 5a143a2b09..26d0d19b6b 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -5877,6 +5877,7 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
draw_info->text_antialias=clone_info->antialias;
if (fabs(clone_info->pointsize) >= MagickEpsilon)
draw_info->pointsize=clone_info->pointsize;
+ draw_info->interline_spacing=draw_info->pointsize;
draw_info->border_color=clone_info->border_color;
if (clone_info->server_name != (char *) NULL)
draw_info->server_name=AcquireString(clone_info->server_name);
|
