Simplify FT2Font.get_font

QuLogic · QuLogic · commit b3e650084b10 · 2024-09-07T03:28:58.000-04:00
Inline `convert_xys_to_array` and modify the arguments to take a C++
container, so we don't need a less-safe pointer, and we don't need to
copy another time over.
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -397,7 +397,7 @@ void FT2Font::set_kerning_factor(int factor)
 }
 
 void FT2Font::set_text(
-    size_t N, uint32_t *codepoints, double angle, FT_Int32 flags, std::vector<double> &xys)
+    std::u32string_view text, double angle, FT_Int32 flags, std::vector<double> &xys)
 {
     FT_Matrix matrix; /* transformation matrix */
 
@@ -420,7 +420,7 @@ void FT2Font::set_text(
     FT_UInt previous = 0;
     FT2Font *previous_ft_object = NULL;
 
-    for (size_t n = 0; n < N; n++) {
+    for (auto codepoint : text) {
         FT_UInt glyph_index = 0;
         FT_BBox glyph_bbox;
         FT_Pos last_advance;
@@ -429,14 +429,14 @@ void FT2Font::set_text(
         std::set<FT_String*> glyph_seen_fonts;
         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,
+                                                 char_to_font, glyph_to_font, codepoint, flags,
                                                  charcode_error, glyph_error, glyph_seen_fonts, false);
         if (!was_found) {
-            ft_glyph_warn((FT_ULong)codepoints[n], glyph_seen_fonts);
+            ft_glyph_warn((FT_ULong)codepoint, glyph_seen_fonts);
             // render missing glyph tofu
             // come back to top-most font
             ft_object_with_glyph = this;
-            char_to_font[codepoints[n]] = ft_object_with_glyph;
+            char_to_font[codepoint] = ft_object_with_glyph;
             glyph_to_font[glyph_index] = ft_object_with_glyph;
             ft_object_with_glyph->load_glyph(glyph_index, flags, ft_object_with_glyph, false);
         }
diff --git a/src/ft2font.h b/src/ft2font.h
@@ -6,9 +6,9 @@
 #ifndef MPL_FT2FONT_H
 #define MPL_FT2FONT_H
 
-#include <cstdint>
 #include <set>
 #include <string>
+#include <string_view>
 #include <unordered_map>
 #include <vector>
 
@@ -77,8 +77,8 @@ class FT2Font
     void set_size(double ptsize, double dpi);
     void set_charmap(int i);
     void select_charmap(unsigned long i);
-    void set_text(
-        size_t N, uint32_t *codepoints, double angle, FT_Int32 flags, std::vector<double> &xys);
+    void set_text(std::u32string_view codepoints, double angle, FT_Int32 flags,
+                  std::vector<double> &xys);
     int get_kerning(FT_UInt left, FT_UInt right, FT_UInt mode, bool fallback);
     int get_kerning(FT_UInt left, FT_UInt right, FT_UInt mode, FT_Vector &delta);
     void set_kerning_factor(int factor);
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -5,25 +5,13 @@
 #include "ft2font.h"
 #include "numpy/arrayobject.h"
 
-#include <cstddef>
 #include <set>
 #include <sstream>
 #include <unordered_map>
 
 namespace py = pybind11;
 using namespace pybind11::literals;
 
-static py::array_t<double>
-convert_xys_to_array(std::vector<double> &xys)
-{
-    py::ssize_t dims[] = { static_cast<py::ssize_t>(xys.size()) / 2, 2 };
-    py::array_t<double> result(dims);
-    if (xys.size() > 0) {
-        memcpy(result.mutable_data(), xys.data(), result.nbytes());
-    }
-    return result;
-}
-
 /**********************************************************************
  * FT2Image
  * */
@@ -345,26 +333,19 @@ const char *PyFT2Font_set_text__doc__ =
     "A sequence of x,y positions in 26.6 subpixels is returned; divide by 64 for pixels.\n";
 
 static py::array_t<double>
-PyFT2Font_set_text(PyFT2Font *self, std::u32string text, double angle = 0.0,
+PyFT2Font_set_text(PyFT2Font *self, std::u32string_view text, double angle = 0.0,
                    FT_Int32 flags = FT_LOAD_FORCE_AUTOHINT)
 {
     std::vector<double> xys;
-    std::vector<uint32_t> codepoints;
-    size_t size;
 
-    size = text.size();
-    codepoints.resize(size);
-    for (size_t i = 0; i < size; ++i) {
-        codepoints[i] = text[i];
-    }
+    self->x->set_text(text, angle, flags, xys);
 
-    uint32_t* codepoints_array = NULL;
-    if (size > 0) {
-        codepoints_array = &codepoints[0];
+    py::ssize_t dims[] = { static_cast<py::ssize_t>(xys.size()) / 2, 2 };
+    py::array_t<double> result(dims);
+    if (xys.size() > 0) {
+        memcpy(result.mutable_data(), xys.data(), result.nbytes());
     }
-    self->x->set_text(size, codepoints_array, angle, flags, xys);
-
-    return convert_xys_to_array(xys);
+    return result;
 }
 
 const char *PyFT2Font_get_num_glyphs__doc__ =
