Merge pull request #23364 from anntzer/pgn

QuLogic · web-flow · commit 246b6a0c9caf · 2022-06-29T17:12:29.000-04:00
Rename/change signature of PyGlyph_new.
diff --git a/src/ft2font.h b/src/ft2font.h
@@ -93,27 +93,27 @@ class FT2Font
     long get_name_index(char *name);
     PyObject* get_path();
 
-    FT_Face &get_face()
+    FT_Face const &get_face() const
     {
         return face;
     }
     FT2Image &get_image()
     {
         return image;
     }
-    FT_Glyph &get_last_glyph()
+    FT_Glyph const &get_last_glyph() const
     {
         return glyphs.back();
     }
-    size_t get_last_glyph_index()
+    size_t get_last_glyph_index() const
     {
         return glyphs.size() - 1;
     }
-    size_t get_num_glyphs()
+    size_t get_num_glyphs() const
     {
         return glyphs.size();
     }
-    long get_hinting_factor()
+    long get_hinting_factor() const
     {
         return hinting_factor;
     }
diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp
@@ -179,8 +179,13 @@ typedef struct
 static PyTypeObject PyGlyphType;
 
 static PyObject *
-PyGlyph_new(const FT_Face &face, const FT_Glyph &glyph, size_t ind, long hinting_factor)
+PyGlyph_from_FT2Font(const FT2Font *font)
 {
+    const FT_Face &face = font->get_face();
+    const FT_Glyph &glyph = font->get_last_glyph();
+    size_t ind = font->get_last_glyph_index();
+    long hinting_factor = font->get_hinting_factor();
+
     PyGlyph *self;
     self = (PyGlyph *)PyGlyphType.tp_alloc(&PyGlyphType, 0);
 
@@ -625,10 +630,7 @@ static PyObject *PyFT2Font_load_char(PyFT2Font *self, PyObject *args, PyObject *
 
     CALL_CPP("load_char", (self->x->load_char(charcode, flags)));
 
-    return PyGlyph_new(self->x->get_face(),
-                       self->x->get_last_glyph(),
-                       self->x->get_last_glyph_index(),
-                       self->x->get_hinting_factor());
+    return PyGlyph_from_FT2Font(self->x);
 }
 
 const char *PyFT2Font_load_glyph__doc__ =
@@ -664,10 +666,7 @@ static PyObject *PyFT2Font_load_glyph(PyFT2Font *self, PyObject *args, PyObject
 
     CALL_CPP("load_glyph", (self->x->load_glyph(glyph_index, flags)));
 
-    return PyGlyph_new(self->x->get_face(),
-                       self->x->get_last_glyph(),
-                       self->x->get_last_glyph_index(),
-                       self->x->get_hinting_factor());
+    return PyGlyph_from_FT2Font(self->x);
 }
 
 const char *PyFT2Font_get_width_height__doc__ =

Original file line number	Diff line number	Diff line change
`@@ -93,27 +93,27 @@ class FT2Font`
`93`	`93`	`long get_name_index(char *name);`
`94`	`94`	`PyObject* get_path();`
`95`	`95`
`96`		`- FT_Face &get_face()`
	`96`	`+ FT_Face const &get_face() const`
`97`	`97`	`{`
`98`	`98`	`return face;`
`99`	`99`	`}`
`100`	`100`	`FT2Image &get_image()`
`101`	`101`	`{`
`102`	`102`	`return image;`
`103`	`103`	`}`
`104`		`- FT_Glyph &get_last_glyph()`
	`104`	`+ FT_Glyph const &get_last_glyph() const`
`105`	`105`	`{`
`106`	`106`	`return glyphs.back();`
`107`	`107`	`}`
`108`		`- size_t get_last_glyph_index()`
	`108`	`+ size_t get_last_glyph_index() const`
`109`	`109`	`{`
`110`	`110`	`return glyphs.size() - 1;`
`111`	`111`	`}`
`112`		`- size_t get_num_glyphs()`
	`112`	`+ size_t get_num_glyphs() const`
`113`	`113`	`{`
`114`	`114`	`return glyphs.size();`
`115`	`115`	`}`
`116`		`- long get_hinting_factor()`
	`116`	`+ long get_hinting_factor() const`
`117`	`117`	`{`
`118`	`118`	`return hinting_factor;`
`119`	`119`	`}`