shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[smooth] Fix segfault caused by previous commit.

* src/smooth/ftgrays.c (gray_set_cell): Always compute
`ras.invalid'.

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

--- a/ChangeLog

+++ b/ChangeLog

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

+2013-07-16  Werner Lemberg  <[email protected]>

+

+	[smooth] Fix segfault caused by previous commit.

+

+	* src/smooth/ftgrays.c (gray_set_cell): Always compute

+	`ras.invalid'.

+

 2013-07-16  David Turner  <[email protected]>

 	[smooth] Improve performance.

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

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

@@ -310,7 +310,7 @@

 #endif

-  /* Compute `divident / divisor' and return both its quotient and     */

+  /* Compute `dividend / divisor' and return both its quotient and     */

   /* remainder, cast to a specific type.  This macro also ensures that */

   /* the remainder is always positive.                                 */

 #define FT_DIV_MOD( type, dividend, divisor, quotient, remainder ) \

@@ -633,10 +633,10 @@

       ras.cover = 0;

       ras.ex    = ex;

       ras.ey    = ey;

-

-      ras.invalid = ( (unsigned)ey >= (unsigned)ras.count_ey ||

-                                ex >= ras.count_ex           );

     }

+

+    ras.invalid = ( (unsigned)ey >= (unsigned)ras.count_ey ||

+                              ex >= ras.count_ex           );

   }