remove ft_get_char_index_or_warn

story645 · story645 · commit 16a3fb9b22c8 · 2023-10-16T15:23:52.000-04:00
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -201,19 +201,6 @@ static void ft_glyph_warn(FT_ULong charcode, FT_String *family_name)
     }
 }
 
-static FT_UInt
-ft_get_char_index_or_warn(FT_Face face, FT_ULong charcode, bool warn = true)
-{
-    FT_UInt glyph_index = FT_Get_Char_Index(face, charcode);
-    if (glyph_index) {
-        return glyph_index;
-    }
-    if (warn) {
-        ft_glyph_warn(charcode, face->family_name);
-    }
-    return 0;
-}
-
 // ft_outline_decomposer should be passed to FT_Outline_Decompose.  On the
 // first pass, vertices and codes are set to NULL, and index is simply
 // incremented for each vertex that should be inserted, so that it is set, at
@@ -592,8 +579,11 @@ void FT2Font::load_char(long charcode, FT_Int32 flags, FT2Font *&ft_object, bool
         ft_object = ft_object_with_glyph;
     } else {
         ft_object = this;
-        FT_UInt glyph_index = ft_get_char_index_or_warn(face, (FT_ULong)charcode);
-
+        FT_UInt glyph_index =  FT_Get_Char_Index(face, (FT_ULong) charcode);
+        if (!glyph_index){
+            // testing if this was ever reached/is no longer needed
+            //ft_glyph_warn((FT_ULong)charcode, face->family_name);
+        }
         if (FT_Error error = FT_Load_Glyph(face, glyph_index, flags)) {
             throw_ft_error("Could not load charcode", error);
         }
@@ -608,8 +598,7 @@ void FT2Font::load_char(long charcode, FT_Int32 flags, FT2Font *&ft_object, bool
 
 bool FT2Font::get_char_fallback_index(FT_ULong charcode, int& index) const
 {
-    /** can segfault if set to true*/
-    FT_UInt glyph_index = ft_get_char_index_or_warn(face, charcode, false);
+    FT_UInt glyph_index =  FT_Get_Char_Index(face, charcode);
     if (glyph_index) {
         // -1 means the host has the char and we do not need to fallback
         index = -1;
@@ -642,7 +631,7 @@ bool FT2Font::load_char_with_fallback(FT2Font *&ft_object_with_glyph,
                                       FT_Error &glyph_error,
                                       bool override = false)
 {
-    FT_UInt glyph_index = ft_get_char_index_or_warn(face, charcode, false);
+    FT_UInt glyph_index = FT_Get_Char_Index(face, charcode);
     family_names.push_back(face->family_name);
     if (glyph_index || override) {
         if ((charcode_error=FT_Load_Glyph(face, glyph_index, flags))) {
@@ -721,8 +710,7 @@ FT_UInt FT2Font::get_char_index(FT_ULong charcode, bool fallback = false)
         ft_object = this;
     }
 
-    // historically, get_char_index never raises a warning
-    return ft_get_char_index_or_warn(ft_object->get_face(), charcode, false);
+    return  FT_Get_Char_Index(ft_object->get_face(), charcode);
 }
 
 void FT2Font::get_width_height(long *width, long *height)
