Commit d725cf9

committed

Make PyFT2Font a subclass of FT2Font

1 parent a7ed126 commit d725cf9Copy full SHA for d725cf9

File tree

3 files changed

+106

-189

lines changed

3 files changed

+106

-189

lines changed

`‎src/ft2font.cpp`

Lines changed: 12 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -207,15 +207,13 @@ FT2Font::get_path(std::vector<double> &vertices, std::vector<unsigned char> &cod`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`FT2Font::FT2Font(long hinting_factor_, std::vector<FT2Font *> &fallback_list,`
`210`		`- FT2Font::WarnFunc warn, bool warn_if_used)`
`211`		`- : ft_glyph_warn(warn), warn_if_used(warn_if_used), image({1, 1}), face(nullptr),`
	`210`	`+ bool warn_if_used)`
	`211`	`+ : warn_if_used(warn_if_used), image({1, 1}), face(nullptr), fallbacks(fallback_list),`
`212`	`212`	`hinting_factor(hinting_factor_),`
`213`	`213`	`// set default kerning factor to 0, i.e., no kerning manipulation`
`214`	`214`	`kerning_factor(0)`
`215`	`215`	`{`
`216`	`216`	`clear();`
`217`		`- // Set fallbacks`
`218`		`- std::copy(fallback_list.begin(), fallback_list.end(), std::back_inserter(fallbacks));`
`219`	`217`	`}`
`220`	`218`
`221`	`219`	`FT2Font::~FT2Font()`
`@@ -544,21 +542,19 @@ FT_UInt FT2Font::get_char_index(FT_ULong charcode, bool fallback = false)`
`544`	`542`	`return FT_Get_Char_Index(ft_object->get_face(), charcode);`
`545`	`543`	`}`
`546`	`544`
`547`		`-voidFT2Font::get_width_height(long width, long height)`
	`545`	`+std::tuple<long, long> FT2Font::get_width_height()`
`548`	`546`	`{`
`549`		`- *width = advance;`
`550`		`- *height = bbox.yMax - bbox.yMin;`
	`547`	`+ return {advance, bbox.yMax - bbox.yMin};`
`551`	`548`	`}`
`552`	`549`
`553`	`550`	`long FT2Font::get_descent()`
`554`	`551`	`{`
`555`	`552`	`return -bbox.yMin;`
`556`	`553`	`}`
`557`	`554`
`558`		`-voidFT2Font::get_bitmap_offset(long x, long y)`
	`555`	`+std::tuple<long, long> FT2Font::get_bitmap_offset()`
`559`	`556`	`{`
`560`		`- *x = bbox.xMin;`
`561`		`- *y = 0;`
	`557`	`+ return {bbox.xMin, 0};`
`562`	`558`	`}`
`563`	`559`
`564`	`560`	`void FT2Font::draw_glyphs_to_bitmap(bool antialiased)`
`@@ -607,8 +603,11 @@ void FT2Font::draw_glyph_to_bitmap(`
`607`	`603`	`draw_bitmap(im, &bitmap->bitmap, x + bitmap->left, y);`
`608`	`604`	`}`
`609`	`605`
`610`		`-void FT2Font::get_glyph_name(unsigned int glyph_number, std::string &buffer)`
	`606`	`+std::string FT2Font::get_glyph_name(unsigned int glyph_number)`
`611`	`607`	`{`
	`608`	`+ std::string buffer;`
	`609`	`+ buffer.resize(128);`
	`610`	`+`
`612`	`611`	`if (!FT_HAS_GLYPH_NAMES(face)) {`
`613`	`612`	`/* Note that this generated name must match the name that`
`614`	`613`	`is generated by ttconv in ttfont_CharStrings_getname. */`
`@@ -625,6 +624,8 @@ void FT2Font::get_glyph_name(unsigned int glyph_number, std::string &buffer)`
`625`	`624`	`buffer.resize(len);`
`626`	`625`	`}`
`627`	`626`	`}`
	`627`	`+`
	`628`	`+ return buffer;`
`628`	`629`	`}`
`629`	`630`
`630`	`631`	`long FT2Font::get_name_index(char *name)`

`‎src/ft2font.h`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`#include <set>`
`13`	`13`	`#include <string>`
`14`	`14`	`#include <string_view>`
	`15`	`+#include <tuple>`
`15`	`16`	`#include <unordered_map>`
`16`	`17`	`#include <vector>`
`17`	`18`
`@@ -96,11 +97,9 @@ extern FT_Library _ft2Library;`
`96`	`97`
`97`	`98`	`class FT2Font`
`98`	`99`	`{`
`99`		`- typedef void (WarnFunc)(FT_ULong charcode, std::set<FT_String> family_names);`
`100`		`-`
`101`	`100`	`public:`
`102`	`101`	`FT2Font(long hinting_factor, std::vector<FT2Font *> &fallback_list,`
`103`		`- WarnFunc warn, bool warn_if_used);`
	`102`	`+ bool warn_if_used);`
`104`	`103`	`virtual ~FT2Font();`
`105`	`104`	`void open(FT_Open_Args &open_args);`
`106`	`105`	`void close();`
`@@ -124,14 +123,14 @@ class FT2Font`
`124`	`123`	`std::set<FT_String*> &glyph_seen_fonts,`
`125`	`124`	`bool override);`
`126`	`125`	`void load_glyph(FT_UInt glyph_index, FT_Int32 flags);`
`127`		`- voidget_width_height(long width, long height);`
`128`		`- voidget_bitmap_offset(long x, long y);`
	`126`	`+ std::tuple<long, long> get_width_height();`
	`127`	`+ std::tuple<long, long> get_bitmap_offset();`
`129`	`128`	`long get_descent();`
`130`	`129`	`void draw_glyphs_to_bitmap(bool antialiased);`
`131`	`130`	`void draw_glyph_to_bitmap(`
`132`	`131`	`py::array_t<uint8_t, py::array::c_style> im,`
`133`	`132`	`int x, int y, size_t glyphInd, bool antialiased);`
`134`		`- void get_glyph_name(unsigned int glyph_number, std::string &buffer);`
	`133`	`+ std::string get_glyph_name(unsigned int glyph_number);`
`135`	`134`	`long get_name_index(char *name);`
`136`	`135`	`FT_UInt get_char_index(FT_ULong charcode, bool fallback);`
`137`	`136`	`void get_path(std::vector<double> &vertices, std::vector<unsigned char> &codes);`
`@@ -167,8 +166,9 @@ class FT2Font`
`167`	`166`	`return FT_HAS_KERNING(face);`
`168`	`167`	`}`
`169`	`168`
	`169`	`+ protected:`
	`170`	`+ virtual void ft_glyph_warn(FT_ULong charcode, std::set<FT_String*> family_names) = 0;`
`170`	`171`	`private:`
`171`		`- WarnFunc ft_glyph_warn;`
`172`	`172`	`bool warn_if_used;`
`173`	`173`	`py::array_t<uint8_t, py::array::c_style> image;`
`174`	`174`	`FT_Face face;`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit d725cf9

File tree

3 files changed

3 files changed

`‎src/ft2font.cpp`

`‎src/ft2font.h`

0 commit comments