[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master cbc6ec8: [ftview] Avoid hangs with bitmap only
From: |
Werner LEMBERG |
Subject: |
[freetype2-demos] master cbc6ec8: [ftview] Avoid hangs with bitmap only fonts. |
Date: |
Fri, 08 Apr 2016 19:29:02 +0000 |
branch: master
commit cbc6ec8b9c11c86001a353e049624349b41187cf
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
[ftview] Avoid hangs with bitmap only fonts.
Problem reported by Hin-Tak Leung <address@hidden>.
* src/ftview.c (Render_Text, Render_Waterfall): Escape loop if not a
single glyph could be rendered.
---
ChangeLog | 9 +++++++++
src/ftview.c | 8 ++++++++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 16f0a77..9c599ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-04-08 Werner Lemberg <address@hidden>
+
+ [ftview] Avoid hangs with bitmap only fonts.
+
+ Problem reported by Hin-Tak Leung <address@hidden>.
+
+ * src/ftview.c (Render_Text, Render_Waterfall): Escape loop if not a
+ single glyph could be rendered.
+
2016-03-18 Werner Lemberg <address@hidden>
* graph/x11/rules.mk (X11_LIB): Also append `/lib64'.
diff --git a/src/ftview.c b/src/ftview.c
index 25d4e25..acccc74 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -565,6 +565,10 @@
{
p = Text;
ch = utf8_next( &p, pEnd );
+
+ /* not a single character of the text string could be displayed */
+ if ( !have_topleft )
+ return error;
}
glyph_idx = FTDemo_Get_Index( handle, (FT_UInt32)ch );
@@ -700,6 +704,10 @@
p = Text;
oldp = p;
ch = utf8_next( &p, pEnd );
+
+ /* not a single character of the text string could be displayed */
+ if ( !have_topleft )
+ return error;
}
glyph_idx = FTDemo_Get_Index( handle, (FT_UInt32)ch );
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master cbc6ec8: [ftview] Avoid hangs with bitmap only fonts.,
Werner LEMBERG <=