fdo-mirrors/freetype
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/freetype/freetype.git synced 2026-05-07 04:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[truetype] Fix SHZ according to specifications.

Browse source 
SHZ must shift the zone specified by its arguments. Previously,
it was shifting zp2 instead.

* src/truetype/ttinterp.c (Ins_SHZ): Rewrite to specifications.
This commit is contained in:
Alexei Podtelezhnikov 2026-04-26 08:26:52 -04:00
parent 7d600a022e
commit 6d0ae3ae94
1 changed files with 40 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/truetype/ttinterp.c
View file

@ -5111,16 +5111,28 @@
Ins_SHZ( TT_ExecContext exc,
FT_Long* args )
{
FT_Vector* cur;
TT_GlyphZoneRec zp;
FT_UShort refp;
FT_UShort refp, i, limit;
FT_F26Dot6 dx,
dy;
FT_UShort limit, i;
if ( BOUNDS( args[0], 2 ) )
/* XXX: UNDOCUMENTED! SHZ doesn't move the phantom points, */
/* which must be subtracted. */
switch ( (FT_Int)args[0] )
{
case 0:
cur = exc->twilight.cur;
limit = exc->twilight.n_points;
break;
case 1:
cur = exc->pts.cur;
limit = exc->pts.n_points > 4U ? exc->pts.n_points - 4U : 0;
break;
default:
if ( exc->pedantic_hinting )
exc->error = FT_THROW( Invalid_Reference );
return;
@ -5129,22 +5141,31 @@
if ( Compute_Point_Displacement( exc, &dx, &dy, &zp, &refp ) )
return;
/* XXX: UNDOCUMENTED! SHZ doesn't move the phantom points. */
/* Twilight zone has no real contours, so use `n_points'. */
/* Normal zone's `n_points' includes phantoms, so must */
/* subtract them. */
if ( exc->GS.gep2 == 0 )
limit = exc->zp2.n_points;
else if ( exc->zp2.n_points > 4U )
limit = exc->zp2.n_points - 4U;
else
return;
/* XXX: UNDOCUMENTED! SHZ doesn't touch the points */
for ( i = 0; i < limit; i++ )
/* XXX: UNDOCUMENTED! SHZ doesn't touch the points. */
if ( dx )
{
if ( zp.cur != exc->zp2.cur || refp != i )
Move_Zp2_Point( exc, i, dx, dy, FALSE );
#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
/* See `ttinterp.h' for details on backward compatibility mode. */
if ( !exc->backward_compatibility )
#endif
for ( i = 0; i < limit; i++ )
{
if ( zp.cur != cur || refp != i )
cur[i].x = ADD_LONG( cur[i].x, dx );
}
}
if ( dy )
{
#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL
/* See `ttinterp.h' for details on backward compatibility mode. */
if ( exc->backward_compatibility != 0x7 )
#endif
for ( i = 0; i < limit; i++ )
{
if ( zp.cur != cur || refp != i )
cur[i].y = ADD_LONG( cur[i].y, dy );
}
}
}