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/sfnt/pngshim.c | |
| parent | ec0bab5697bb31ba980810145f62e3799946ec60 (diff) | |
| download | android_external_freetype-9c745321260bb728ab1cd1c8fd5f075854b2ad49.tar.gz android_external_freetype-9c745321260bb728ab1cd1c8fd5f075854b2ad49.tar.bz2 android_external_freetype-9c745321260bb728ab1cd1c8fd5f075854b2ad49.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/sfnt/pngshim.c')
| -rw-r--r-- | src/sfnt/pngshim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c index 878de1f..9afbe5a 100644 --- a/src/sfnt/pngshim.c +++ b/src/sfnt/pngshim.c @@ -4,7 +4,7 @@ /* */ /* PNG Bitmap glyph support. */ /* */ -/* Copyright 2013 by Google, Inc. */ +/* Copyright 2013, 2014 by Google, Inc. */ /* Written by Stuart Gill and Behdad Esfahbod. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -129,7 +129,7 @@ *error = FT_THROW( Out_Of_Memory ); #ifdef PNG_SETJMP_SUPPORTED - longjmp( png_jmpbuf( png ), 1 ); + ft_longjmp( png_jmpbuf( png ), 1 ); #endif /* if we get here, then we have no choice but to abort ... */ } |