[vlc-commits] freetype: fix extra squares in Arabic subtitles (fixes #6152 #8117)

[Salah-Eddin Shaban]

vlc/vlc-2.2 | branch: master | Salah-Eddin Shaban <salshaaban at gmail.com> | Mon Jan  5 14:52:33 2015 +0000| [2474f6139b6a7c74dc504d1a682e45b9c634eb03] | committer: Jean-Baptiste Kempf

freetype: fix extra squares in Arabic subtitles (fixes #6152 #8117)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 9be4f7e0b5e289015f64508c8321d84c6abecd04)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=2474f6139b6a7c74dc504d1a682e45b9c634eb03
---

 modules/text_renderer/freetype.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/text_renderer/freetype.c b/modules/text_renderer/freetype.c
index f7fcd80..b9da7bf 100644
--- a/modules/text_renderer/freetype.c
+++ b/modules/text_renderer/freetype.c
@@ -1360,6 +1360,12 @@ static int ProcessLines( filter_t *p_filter,
                 uni_char_t character = psz_text[i_index];
                 int i_glyph_index = FT_Get_Char_Index( p_current_face, character );
 
+                /* If the missing glyph is U+FEFF (ZERO WIDTH NO-BREAK SPACE) */
+                /* we can safely ignore it. Otherwise extra squares show up   */
+                /* in Arabic text.                                            */
+                if( i_glyph_index == 0 && character == 0xFEFF )
+                    goto next;
+
                 /* Get kerning vector */
                 FT_Vector kerning = { .x = 0, .y = 0 };
                 if( FT_HAS_KERNING( p_current_face ) && i_glyph_last != 0 && i_glyph_index != 0 )