fix tests

story645 · story645 · commit b874d3854fcb · 2023-10-04T16:55:59.000-04:00
diff --git a/lib/matplotlib/tests/test_ft2font.py b/lib/matplotlib/tests/test_ft2font.py
@@ -87,9 +87,8 @@ def test_fallback_cascade_missing(recwarn):
     fig.canvas.draw()
     assert all(isinstance(warn.message, UserWarning) for warn in recwarn)
     e = "Glyph 128579 (\\N{{UPSIDE-DOWN FACE}}) missing from current font {}."
-    expected = [list(e.format(font)) for font in font_list]
-    actual = [list(warn.message.args) for warn in recwarn]
-    assert actual == expected
+    assert ([(warn.message.args) for warn in recwarn] == 
+            [(e.format(font),) for font in font_list])
 
 
 @pytest.mark.filterwarnings("ignore: Glyph ")
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -506,19 +506,23 @@ void FT2Font::set_text(
     FT_UInt previous = 0;
     FT2Font *previous_ft_object = NULL;
 
+    FT_WarnCache warn_cache;
+
     for (size_t n = 0; n < N; n++) {
         FT_UInt glyph_index = 0;
         FT_BBox glyph_bbox;
         FT_Pos last_advance;
 
         FT_Error charcode_error, glyph_error;
         FT2Font *ft_object_with_glyph = this;
+
         bool was_found = load_char_with_fallback(ft_object_with_glyph, glyph_index, glyphs,
                                                  char_to_font, glyph_to_font, codepoints[n], flags,
-                                                 charcode_error, glyph_error, false);
+                                                 charcode_error, glyph_error, false, &warn_cache);
         if (!was_found) {
             // render missing glyph tofu
             // come back to top-most font
+            warn_cache.warn();
             ft_object_with_glyph = this;
             char_to_font[codepoints[n]] = ft_object_with_glyph;
             glyph_to_font[glyph_index] = ft_object_with_glyph;
@@ -579,9 +583,11 @@ void FT2Font::load_char(long charcode, FT_Int32 flags, FT2Font *&ft_object, bool
         FT_UInt final_glyph_index;
         FT_Error charcode_error, glyph_error;
         FT2Font *ft_object_with_glyph = this;
+        FT_WarnCache warn_cache;
         bool was_found = load_char_with_fallback(ft_object_with_glyph, final_glyph_index, glyphs, char_to_font,
-                                glyph_to_font, charcode, flags, charcode_error, glyph_error, true);
+                                glyph_to_font, charcode, flags, charcode_error, glyph_error, true, warn_cache);
         if (!was_found) {
+            warn_cache.warn();
             if (charcode_error) {
                 throw_ft_error("Could not load charcode", charcode_error);
             }
@@ -639,9 +645,11 @@ bool FT2Font::load_char_with_fallback(FT2Font *&ft_object_with_glyph,
                                       FT_Int32 flags,
                                       FT_Error &charcode_error,
                                       FT_Error &glyph_error,
-                                      bool override = false)
+                                      bool override = false, std::vector<FT_WarnCache> &warn_cache)
 {
-    FT_UInt glyph_index = ft_get_char_index_or_warn(face, charcode);
+    FT_UInt glyph_index = ft_get_char_index_or_warn(face, charcode, warn=false);
+    if (!glyph_index){
+        warn_cache.push_back(charcode, face->family_name)};
     if (glyph_index || override) {
         if (charcode_error=FT_Load_Glyph(face, glyph_index, flags)) {
             return false;
@@ -834,3 +842,9 @@ long FT2Font::get_name_index(char *name)
 {
     return FT_Get_Name_Index(face, (FT_String *)name);
 }
+
+void FT_WarnCache::warn(){
+    for (int i=0; i<cache.size(); i++){
+        ft_glyph_warn(self.cache[i].charcode, self.cache[i].family_name);
+    }        
+}
diff --git a/src/ft2font.h b/src/ft2font.h
@@ -91,7 +91,8 @@ class FT2Font
                                  FT_Int32 flags,
                                  FT_Error &charcode_error,
                                  FT_Error &glyph_error,
-                                 bool override);
+                                 bool override, 
+                                 FT_WarnCache &warn_cache);
     void load_glyph(FT_UInt glyph_index, FT_Int32 flags, FT2Font *&ft_object, bool fallback);
     void load_glyph(FT_UInt glyph_index, FT_Int32 flags);
     void get_width_height(long *width, long *height);
@@ -156,4 +157,14 @@ class FT2Font
     FT2Font &operator=(const FT2Font &);
 };
 
+class FT_WarnCache{
+    private:
+        struct entry{
+            FT_ULong charcode;
+            FT_String family_name;
+        };
+        std::vector<entry> cache;
+    void warn();
+};
+
 #endif
