shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

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

git/fs: mount .git/fs: mount/attach disallowed

--- a/src/sfnt/ttcolr.c

+++ b/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,7 +585,7 @@

       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 ==

@@ -592,7 +592,7 @@

              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

       {