[Git][freetype/freetype][master] 2 commits: * src/truetype/ttgxvar.c: Fix typos in macros that guard CVAR code.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• 23d1d8ad
  by Jany Belluz at 2021-11-04T12:07:47+01:00

  * src/truetype/ttgxvar.c: Fix typos in macros that guard CVAR code.
  

• 9ed5332f
  by Jany Belluz at 2021-11-04T12:09:01+01:00

  [truetype] Fix CVAR handling of tuples for all points.
  
  * src/truetype/ttgxvar (tt_face_vary_cvt): Function
  `ft_var_readpackedpoints`, when it returns `ALL_POINTS`, also sets
  `point_count` to value 0.  However, the CVAR code was incorrectly expecting
  that `point_count` would be set to match the length of the CVT table.
  

1 changed file:

• src/truetype/ttgxvar.c

Changes:

src/truetype/ttgxvar.c

---

...	...	@@ -3164,7 +3164,7 @@
3164	3164	/*************************************************************************/
3165	3165
3166	3166
3167		-#ifdef TT_CONFIG_GPTION_BYTECODE_INTERPRETER
	3167	+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
3168	3168
3169	3169	static FT_Error
3170	3170	tt_cvt_ready_iterator( FT_ListNode node,
...	...	@@ -3211,7 +3211,7 @@
3211	3211	tt_face_vary_cvt( TT_Face face,
3212	3212	FT_Stream stream )
3213	3213	{
3214		-#ifdef TT_CONFIG_GPTION_BYTECODE_INTERPRETER
	3214	+#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
3215	3215
3216	3216	FT_Error error;
3217	3217	FT_Memory memory = stream->memory;
...	...	@@ -3416,9 +3416,7 @@
3416	3416	point_count == 0 ? face->cvt_size
3417	3417	: point_count );
3418	3418
3419		- if ( !points ||
3420		- !deltas ||
3421		- ( localpoints == ALL_POINTS && point_count != face->cvt_size ) )
	3419	+ if ( !points || !deltas )
3422	3420	; /* failure, ignore it */
3423	3421
3424	3422	else if ( localpoints == ALL_POINTS )

—
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.