diff options
| author | Behdad Esfahbod <behdad@google.com> | 2014-08-08 17:55:11 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@google.com> | 2014-08-08 17:59:36 -0400 |
| commit | 9c745321260bb728ab1cd1c8fd5f075854b2ad49 (patch) | |
| tree | 86c9ee0214cac2870a94905e4240732413ed768b /src/smooth | |
| parent | ec0bab5697bb31ba980810145f62e3799946ec60 (diff) | |
| download | android_external_freetype-staging/cm-12.0-caf.tar.gz android_external_freetype-staging/cm-12.0-caf.tar.bz2 android_external_freetype-staging/cm-12.0-caf.zip | |
Update freetype to e1394d56752cac3bd68ab2358a8e1384ce7b9aaastaging/cm-12.0-cafstaging/cm-12.0
Integrated patches from freetype2 git repository, up to hashval
e1394d56752cac3bd68ab2358a8e1384ce7b9aaa, which is post-2.5.3.
Most recent commit message from freetype git:
Minor documentation improvement.
Noteworthy patches included:
Fix Savannah bug #41697, part 2.
Fix Savannah bug #41697, part 1.
Bug: 16575323
Change-Id: I4f8f9375afd2540618b3ebf6152d77b743975dce
Diffstat (limited to 'src/smooth')
| -rw-r--r-- | src/smooth/ftgrays.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index 2c51e9f..27be966 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -4,7 +4,7 @@ /* */ /* A new `perfect' anti-aliasing renderer (body). */ /* */ -/* Copyright 2000-2003, 2005-2013 by */ +/* Copyright 2000-2003, 2005-2014 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -98,6 +98,9 @@ #define FT_ERR_XCAT( x, y ) x ## y #define FT_ERR_CAT( x, y ) FT_ERR_XCAT( x, y ) +#define FT_BEGIN_STMNT do { +#define FT_END_STMNT } while ( 0 ) + /* define this to dump debugging information */ /* #define FT_DEBUG_LEVEL_TRACE */ @@ -1364,7 +1367,6 @@ typedef ptrdiff_t FT_PtrDist; ras.num_gray_spans = 0; ras.span_y = (int)y; - count = 0; span = ras.gray_spans; } else |