[sfnt] 'COLR' v1 PaintTranslate and PaintScale precision

* src/sfnt/ttcolr.c (read_paint): Implement spec changes in
PaintTranslate and PaintScale and friends.  Update parsing to read
new shorter values.
1076-regression-ft_render_glyph-returns-error-when-trying-to-render-bitmap-otb-fonts
Dominik Röttsches 4 years ago committed by Werner Lemberg
parent 6af39c3d76
commit d7bdcb1bb5
  1. 12
      src/sfnt/ttcolr.c

@ -566,8 +566,8 @@
apaint->u.translate.paint.p = child_table_p;
apaint->u.translate.paint.insert_root_transform = 0;
apaint->u.translate.dx = FT_NEXT_LONG( p );
apaint->u.translate.dy = FT_NEXT_LONG( p );
apaint->u.translate.dx = FT_NEXT_SHORT( p ) << 16;
apaint->u.translate.dy = FT_NEXT_SHORT( p ) << 16;
return 1;
}
@ -585,14 +585,14 @@
apaint->u.scale.paint.insert_root_transform = 0;
/* All scale paints get at least one scale value. */
apaint->u.scale.scale_x = FT_NEXT_LONG( p );
apaint->u.scale.scale_x = FT_NEXT_SHORT( p ) << 2;
/* Non-uniform ones read an extra y value. */
if ( apaint->format ==
FT_COLR_PAINTFORMAT_SCALE ||
(FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_SCALE_CENTER )
apaint->u.scale.scale_y = FT_NEXT_LONG( p );
apaint->u.scale.scale_y = FT_NEXT_SHORT( p ) << 2;
else
apaint->u.scale.scale_y = apaint->u.scale.scale_x;
@ -603,8 +603,8 @@
(FT_PaintFormat_Internal)apaint->format ==
FT_COLR_PAINTFORMAT_INTERNAL_SCALE_UNIFORM_CENTER )
{
apaint->u.scale.center_x = FT_NEXT_LONG ( p );
apaint->u.scale.center_y = FT_NEXT_LONG ( p );
apaint->u.scale.center_x = FT_NEXT_SHORT ( p ) << 16;
apaint->u.scale.center_y = FT_NEXT_SHORT ( p ) << 16;
}
else
{

Loading…
Cancel
Save