[Git][freetype/freetype][master] [cff] Synchronize `cff_slot_load` with `TT_Load_Glyph`.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• d2c3bbcd
  by Werner Lemberg at 2022-03-19T19:31:25+01:00

  [cff] Synchronize `cff_slot_load` with `TT_Load_Glyph`.
  
  * src/cff/cffgload.c (IS_DEFAULT_INSTANCE): New macro.
  (cff_slot_load): Use it.
  

1 changed file:

• src/cff/cffgload.c

Changes:

src/cff/cffgload.c

---

...	...	@@ -29,6 +29,14 @@
29	29
30	30	#include "cfferrs.h"
31	31
	32	+#ifdef TT_CONFIG_OPTION_GX_VAR_SUPPORT
	33	+#define IS_DEFAULT_INSTANCE( _face ) \
	34	+ ( !( FT_IS_NAMED_INSTANCE( _face ) || \
	35	+ FT_IS_VARIATION( _face ) ) )
	36	+#else
	37	+#define IS_DEFAULT_INSTANCE( _face ) 1
	38	+#endif
	39	+
32	40
33	41	/**************************************************************************
34	42	*
...	...	@@ -255,8 +263,8 @@
255	263
256	264
257	265	if ( size->strike_index != 0xFFFFFFFFUL &&
258		- sfnt->load_eblc &&
259		- ( load_flags & FT_LOAD_NO_BITMAP ) == 0 )
	266	+ ( load_flags & FT_LOAD_NO_BITMAP ) == 0 &&
	267	+ IS_DEFAULT_INSTANCE( size->root.face ) )
260	268	{
261	269	TT_SBit_MetricsRec metrics;
262	270

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.