]> granicus.if.org Git - imagemagick/commitdiff
https://github.com/ImageMagick/ImageMagick/issues/1704
authorCristy <urban-warrior@imagemagick.org>
Sat, 28 Sep 2019 12:18:06 +0000 (08:18 -0400)
committerCristy <urban-warrior@imagemagick.org>
Sat, 28 Sep 2019 12:18:06 +0000 (08:18 -0400)
ChangeLog
MagickCore/annotate.c

index 30cc0a4021aef9fc7ee115cf4f0880567a82e797..7ca8e07e4e4fa5bbfe08a017776a92237c9f1b2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-09-28  7.0.8-67 Cristy  <quetzlzacatenango@image...>
+  * Release ImageMagick version 7.0.8-67, GIT revision 16...
+
+2019-09-28  7.0.8-67 Cristy  <quetzlzacatenango@image...>
+  * line endings renedered as empty boxes (reference
+    https://github.com/ImageMagick/ImageMagick/issues/1704).
+
 2019-09-21  7.0.8-66 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.8-66, GIT revision 16134:f6ce80a:20190921.
 
index 61af882d6ce88b12caf8afbd9a485399aa7050e6..6034f4088597cc246a6db68cc33bbdf743a0677b 100644 (file)
@@ -1316,7 +1316,8 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
 
   FT_UInt
     first_glyph_id,
-    last_glyph_id;
+    last_glyph_id,
+    space_glyph_id;
 
   FT_Vector
     origin;
@@ -1566,6 +1567,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
   grapheme=(GraphemeInfo *) NULL;
   length=ComplexTextLayout(image,draw_info,p,strlen(p),face,flags,&grapheme,
     exception);
+  space_glyph_id=FT_Get_Char_Index(face,' ');
   code=0;
   for (i=0; i < (ssize_t) length; i++)
   {
@@ -1576,6 +1578,8 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
       Render UTF-8 sequence.
     */
     glyph.id=(FT_UInt) grapheme[i].index;
+    if (glyph.id == 0)
+      glyph.id=space_glyph_id;
     if ((glyph.id != 0) && (last_glyph_id != 0))
       origin.x+=(FT_Pos) (64.0*draw_info->kerning);
     glyph.origin=origin;