Merge pull request #14870 from anntzer/get_char_index_none

QuLogic · web-flow · commit 520b5f65dd61 · 2019-07-23T17:32:31.000-04:00
FT2Font.get_char_index never returns None.
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -2198,29 +2198,27 @@ def draw_text_woven(chunks):
                     for c in chunk:
                         ccode = ord(c)
                         gind = font.get_char_index(ccode)
-                        if gind is not None:
-                            if mode == 2 and chunk_type == 2:
-                                glyph_name = font.get_glyph_name(gind)
-                                self.file.output(Op.gsave)
-                                self.file.output(0.001 * fontsize, 0,
-                                                 0, 0.001 * fontsize,
-                                                 newx, 0, Op.concat_matrix)
-                                name = self.file._get_xobject_symbol_name(
-                                    font.fname, glyph_name)
-                                self.file.output(Name(name), Op.use_xobject)
-                                self.file.output(Op.grestore)
-
-                            # Move the pointer based on the character width
-                            # and kerning
-                            glyph = font.load_char(ccode,
-                                                   flags=LOAD_NO_HINTING)
-                            if lastgind is not None:
-                                kern = font.get_kerning(
-                                    lastgind, gind, KERNING_UNFITTED)
-                            else:
-                                kern = 0
-                            lastgind = gind
-                            newx += kern/64.0 + glyph.linearHoriAdvance/65536.0
+                        if mode == 2 and chunk_type == 2:
+                            glyph_name = font.get_glyph_name(gind)
+                            self.file.output(Op.gsave)
+                            self.file.output(0.001 * fontsize, 0,
+                                             0, 0.001 * fontsize,
+                                             newx, 0, Op.concat_matrix)
+                            name = self.file._get_xobject_symbol_name(
+                                font.fname, glyph_name)
+                            self.file.output(Name(name), Op.use_xobject)
+                            self.file.output(Op.grestore)
+
+                        # Move the pointer based on the character width
+                        # and kerning
+                        glyph = font.load_char(ccode, flags=LOAD_NO_HINTING)
+                        if lastgind is not None:
+                            kern = font.get_kerning(
+                                lastgind, gind, KERNING_UNFITTED)
+                        else:
+                            kern = 0
+                        lastgind = gind
+                        newx += kern / 64 + glyph.linearHoriAdvance / 65536
 
                 if mode == 1:
                     self.file.output(Op.end_text)
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -630,12 +630,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
             for c in s:
                 ccode = ord(c)
                 gind = font.get_char_index(ccode)
-                if gind is None:
-                    ccode = ord('?')
-                    name = '.notdef'
-                    gind = 0
-                else:
-                    name = font.get_glyph_name(gind)
+                name = font.get_glyph_name(gind)
                 glyph = font.load_char(ccode, flags=LOAD_NO_HINTING)
 
                 if lastgind is not None:
diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py
@@ -183,9 +183,6 @@ def get_glyphs_with_font(self, font, s, glyph_map=None,
         for c in s:
             ccode = ord(c)
             gind = font.get_char_index(ccode)
-            if gind is None:
-                ccode = ord('?')
-                gind = 0
 
             if lastgind is not None:
                 kern = font.get_kerning(lastgind, gind, KERNING_DEFAULT)
