Merge pull request #11605 from anntzer/spurious-ft2font-missing-glyph-warning

tacaswell · web-flow · commit 7684f0f5f42c · 2018-07-09T09:20:05.000-04:00
MNT: Suppress a spurious missing-glyph warning with ft2font.
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -168,7 +168,7 @@ inline double conv(long v)
 FT_UInt ft_get_char_index_or_warn(FT_Face face, FT_ULong charcode)
 {
     FT_UInt glyph_index = FT_Get_Char_Index(face, charcode);
-    if (!glyph_index) {
+    if (charcode && !glyph_index) {
         PyErr_WarnEx(NULL, "Required glyph missing from current font.", 1);
     }
     return glyph_index;

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ inline double conv(long v)`
`168`	`168`	`FT_UInt ft_get_char_index_or_warn(FT_Face face, FT_ULong charcode)`
`169`	`169`	`{`
`170`	`170`	`FT_UInt glyph_index = FT_Get_Char_Index(face, charcode);`
`171`		`- if (!glyph_index) {`
	`171`	`+ if (charcode && !glyph_index) {`
`172`	`172`	`PyErr_WarnEx(NULL, "Required glyph missing from current font.", 1);`
`173`	`173`	`}`
`174`	`174`	`return glyph_index;`