shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[smooth] Fix valgrind warning and reoptimize.

The algorithm calls `gray_set_cell' at the start of each new contour
or when the contours cross the cell boundaries. Double-checking for
that is wasteful.

* src/smooth/ftgrays.c (gray_set_cell): Remove check for a new cell.
(gray_convert_glyph): Remove initialization introduced by 44b172e88.

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

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,14 @@

+2016-09-11  Alexei Podtelezhnikov  <[email protected]>

+

+	[smooth] Fix valgrind warning and reoptimize.

+

+	The algorithm calls `gray_set_cell' at the start of each new contour

+	or when the contours cross the cell boundaries. Double-checking for

+	that is wasteful.

+

+	* src/smooth/ftgrays.c (gray_set_cell): Remove check for a new cell.

+	(gray_convert_glyph): Remove initialization introduced by 44b172e88.

+

 2016-09-10  Werner Lemberg  <[email protected]>

 	[sfnt] Fix previous commit.

--- a/src/smooth/ftgrays.c

+++ b/src/smooth/ftgrays.c

@@ -577,6 +577,7 @@

     /* All cells that are on the left of the clipping region go to the */

     /* min_ex - 1 horizontal position.                                 */

+

     if ( ex > ras.max_ex )

       ex = ras.max_ex;

@@ -583,18 +584,14 @@

     if ( ex < ras.min_ex )

       ex = ras.min_ex - 1;

-    /* are we moving to a different cell ? */

-    if ( ex != ras.ex || ey != ras.ey )

-    {

-      /* record the current one if it is valid */

-      if ( !ras.invalid )

-        gray_record_cell( RAS_VAR );

+    /* record the current one if it is valid */

+    if ( !ras.invalid )

+      gray_record_cell( RAS_VAR );

-      ras.area  = 0;

-      ras.cover = 0;

-      ras.ex    = ex;

-      ras.ey    = ey;

-    }

+    ras.area  = 0;

+    ras.cover = 0;

+    ras.ex    = ex;

+    ras.ey    = ey;

     ras.invalid = ( ey >= ras.max_ey || ey < ras.min_ey ||

                     ex >= ras.max_ex );

@@ -1820,7 +1817,7 @@

         ras.num_cells = 0;

         ras.invalid   = 1;

         ras.min_ey    = band[1];

-        ras.max_ey    = ras.ey = band[0];

+        ras.max_ey    = band[0];

         error = gray_convert_glyph_inner( RAS_VAR );