shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[truetype] Make all glyphs in `Zycon' GX font work.

* src/truetype/ttgxvar.c (ft_var_readpackedpoints): Fix boundary
tests.

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

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,10 @@

+2016-07-16  Behdad Esfahbod  <[email protected]>

+

+	[truetype] Make all glyphs in `Zycon' GX font work.

+

+	* src/truetype/ttgxvar.c (ft_var_readpackedpoints): Fix boundary

+	tests.

+

 2016-07-16  Werner Lemberg  <[email protected]>

 	[truetype] Fix GX delta tracing.

--- a/src/truetype/ttgxvar.c

+++ b/src/truetype/ttgxvar.c

@@ -174,14 +174,13 @@

         first      += FT_GET_USHORT();

         points[i++] = first;

-        if ( runcnt < 1 || i + runcnt > n )

-          goto Exit;

-

         /* first point not included in run count */

         for ( j = 0; j < runcnt; j++ )

         {

           first      += FT_GET_USHORT();

           points[i++] = first;

+          if ( i == n )

+            break;

         }

       }

       else

@@ -189,18 +188,16 @@

         first      += FT_GET_BYTE();

         points[i++] = first;

-        if ( runcnt < 1 || i + runcnt > n )

-          goto Exit;

-

         for ( j = 0; j < runcnt; j++ )

         {

           first      += FT_GET_BYTE();

           points[i++] = first;

+          if ( i == n )

+            break;

         }

       }

     }

-  Exit:

     return points;

   }