Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1463)

Unified Diff: third_party/freetype/src/sfnt/pngshim.h

Issue 815103002: Update freetype to 2.5.4. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Adjust GYP and GN Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/freetype/src/sfnt/Jamfile ('k') | third_party/freetype/src/sfnt/pngshim.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/freetype/src/sfnt/pngshim.h
diff --git a/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/pngshim.h b/third_party/freetype/src/sfnt/pngshim.h
similarity index 91%
rename from core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/pngshim.h
rename to third_party/freetype/src/sfnt/pngshim.h
index a25086b15764b4b31b5c96c7cb656936d2d852dd..dc9ecaf9189fadbcc22ff467b3fe691a6a559ca1 100644
--- a/core/src/fxge/fx_freetype/fxft2.5.01/src/sfnt/pngshim.h
+++ b/third_party/freetype/src/sfnt/pngshim.h
@@ -20,7 +20,7 @@
#define __PNGSHIM_H__
-#include "../../include/ft2build.h"
+#include <ft2build.h>
#include "ttload.h"
@@ -29,14 +29,15 @@ FT_BEGIN_HEADER
#ifdef FT_CONFIG_OPTION_USE_PNG
FT_LOCAL( FT_Error )
- Load_SBit_Png( FT_Bitmap* map,
+ Load_SBit_Png( FT_GlyphSlot slot,
FT_Int x_offset,
FT_Int y_offset,
FT_Int pix_bits,
TT_SBit_Metrics metrics,
FT_Memory memory,
FT_Byte* data,
- FT_UInt png_len );
+ FT_UInt png_len,
+ FT_Bool populate_map_and_metrics );
#endif
« no previous file with comments | « third_party/freetype/src/sfnt/Jamfile ('k') | third_party/freetype/src/sfnt/pngshim.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698