NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.3k

Commitd0908d8

committed

clean up

1 parent33c986b commitd0908d8Copy full SHA for d0908d8

File tree

2 files changed

-35

lines changed

src
- ft2font.cpp
- ft2font.h

2 files changed

-35

lines changed

`‎src/ft2font.cpp`

Lines changed: 4 additions & 21 deletions

Original file line number	Diff line number	Diff line change
`@@ -506,23 +506,19 @@ void FT2Font::set_text(`
`506`	`506`	`FT_UInt previous =0;`
`507`	`507`	`FT2Font *previous_ft_object =NULL;`
`508`	`508`
`509`		`- FT_WarnCache warn_cache;`
`510`		`-`
`511`	`509`	`for (size_t n =0; n < N; n++) {`
`512`	`510`	`FT_UInt glyph_index =0;`
`513`	`511`	`FT_BBox glyph_bbox;`
`514`	`512`	`FT_Pos last_advance;`
`515`	`513`
`516`	`514`	`FT_Error charcode_error, glyph_error;`
`517`	`515`	`FT2Font *ft_object_with_glyph =this;`
`518`		`-`
`519`	`516`	`bool was_found =load_char_with_fallback(ft_object_with_glyph, glyph_index, glyphs,`
`520`	`517`	`char_to_font, glyph_to_font, codepoints[n], flags,`
`521`		`- charcode_error, glyph_error,&warn_cache,false);`
	`518`	`+ charcode_error, glyph_error,false);`
`522`	`519`	`if (!was_found) {`
`523`	`520`	`// render missing glyph tofu`
`524`	`521`	`// come back to top-most font`
`525`		`- warn_cache.warn();`
`526`	`522`	`ft_object_with_glyph =this;`
`527`	`523`	`char_to_font[codepoints[n]] = ft_object_with_glyph;`
`528`	`524`	`glyph_to_font[glyph_index] = ft_object_with_glyph;`
`@@ -583,13 +579,9 @@ void FT2Font::load_char(long charcode, FT_Int32 flags, FT2Font *&ft_object, bool`
`583`	`579`	`FT_UInt final_glyph_index;`
`584`	`580`	`FT_Error charcode_error, glyph_error;`
`585`	`581`	`FT2Font *ft_object_with_glyph =this;`
`586`		`- FT_WarnCache warn_cache;`
`587`		`-bool was_found =load_char_with_fallback(ft_object_with_glyph,`
`588`		`- final_glyph_index, glyphs, char_to_font,`
`589`		`- glyph_to_font, charcode, flags, charcode_error,`
`590`		`- glyph_error, warn_cache,true);`
	`582`	`+bool was_found =load_char_with_fallback(ft_object_with_glyph, final_glyph_index, glyphs, char_to_font,`
	`583`	`+ glyph_to_font, charcode, flags, charcode_error, glyph_error,true);`
`591`	`584`	`if (!was_found) {`
`592`		`- warn_cache.warn();`
`593`	`585`	`if (charcode_error) {`
`594`	`586`	`throw_ft_error("Could not load charcode", charcode_error);`
`595`	`587`	`}`
`@@ -647,12 +639,9 @@ bool FT2Font::load_char_with_fallback(FT2Font *&ft_object_with_glyph,`
`647`	`639`	`FT_Int32 flags,`
`648`	`640`	`FT_Error &charcode_error,`
`649`	`641`	`FT_Error &glyph_error,`
`650`		`- std::vector<FT_WarnCache> &warn_cache,`
`651`	`642`	`booloverride =false)`
`652`	`643`	`{`
`653`		`- FT_UInt glyph_index =ft_get_char_index_or_warn(face, charcode, warn=false);`
`654`		`-if (!glyph_index){`
`655`		`- warn_cache.push_back(charcode, face->family_name)};`
	`644`	`+ FT_UInt glyph_index =ft_get_char_index_or_warn(face, charcode);`
`656`	`645`	`if (glyph_index \|\|override) {`
`657`	`646`	`if (charcode_error=FT_Load_Glyph(face, glyph_index, flags)) {`
`658`	`647`	`returnfalse;`
`@@ -845,9 +834,3 @@ long FT2Font::get_name_index(char *name)`
`845`	`834`	`{`
`846`	`835`	`returnFT_Get_Name_Index(face, (FT_String *)name);`
`847`	`836`	`}`
`848`		`-`
`849`		`-voidFT_WarnCache::warn(){`
`850`		`-for (int i=0; i<cache.size(); i++){`
`851`		`-ft_glyph_warn(cache[i].charcode, cache[i].family_name);`
`852`		`- }`
`853`		`-}`

`‎src/ft2font.h`

Lines changed: 2 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,19 +66,6 @@ class FT2Image`
`66`	`66`
`67`	`67`	`extern FT_Library _ft2Library;`
`68`	`68`
`69`		`-classFT_WarnCache{`
`70`		`-private:`
`71`		`-structentry{`
`72`		`- FT_ULong charcode;`
`73`		`- FT_String family_name;`
`74`		`- };`
`75`		`- std::vector<entry> cache;`
`76`		`-public:`
`77`		`-FT_WarnCache();`
`78`		`-voidwarn();`
`79`		`-};`
`80`		`-`
`81`		`-#endif`
`82`	`69`	`classFT2Font`
`83`	`70`	`{`
`84`	`71`
`@@ -104,7 +91,6 @@ class FT2Font`
`104`	`91`	`FT_Int32 flags,`
`105`	`92`	`FT_Error &charcode_error,`
`106`	`93`	`FT_Error &glyph_error,`
`107`		`- FT_WarnCache &warn_cache,`
`108`	`94`	`booloverride);`
`109`	`95`	`voidload_glyph(FT_UInt glyph_index, FT_Int32 flags, FT2Font *&ft_object,bool fallback);`
`110`	`96`	`voidload_glyph(FT_UInt glyph_index, FT_Int32 flags);`
`@@ -169,3 +155,5 @@ class FT2Font`
`169`	`155`	`FT2Font(const FT2Font &);`
`170`	`156`	`FT2Font &operator=(const FT2Font &);`
`171`	`157`	`};`
	`158`	`+`
	`159`	`+#endif`

0 commit comments

Comments

(0)

Movatterモバイル変換

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!

Commitd0908d8

File tree

2 files changed

2 files changed

`‎src/ft2font.cpp`

`‎src/ft2font.h`

0 commit comments