diff options
| author | Bo Xu <bo_xu@foxitsoftware.com> | 2014-12-19 14:29:17 -0800 |
|---|---|---|
| committer | Bo Xu <bo_xu@foxitsoftware.com> | 2014-12-19 14:29:17 -0800 |
| commit | e4fc5ced45c8fcfbe2487ec64eab036bc7d57602 (patch) | |
| tree | 1889eac2d57ff76d5f0fef689a3cbdfa37a0b3f4 /third_party/freetype/src/sfnt/pngshim.h | |
| parent | 5a35129bce7ca777e155e5498e8d4792fa6a4819 (diff) | |
| download | pdfium-e4fc5ced45c8fcfbe2487ec64eab036bc7d57602.tar.xz | |
Update freetype to 2.5.4.
Put freetype into third_party directory, cleaning up header files.
Previously freetype header files are in core/src/fxge/freetype and core/include/thirdparties. There were also multiple fx_freetype.h.
This patch removes the additional Foxit wrapper to make further update easier.
Notice, for original freetype source code, the following files are modified and need to be updated accordingly in future update:
third_party/freetype/include/config/ftmodule.h
third_party/freetype/include/config/ftoption.h
BUG=407341
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/815103002
Diffstat (limited to 'third_party/freetype/src/sfnt/pngshim.h')
| -rw-r--r-- | third_party/freetype/src/sfnt/pngshim.h | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/third_party/freetype/src/sfnt/pngshim.h b/third_party/freetype/src/sfnt/pngshim.h new file mode 100644 index 0000000000..dc9ecaf918 --- /dev/null +++ b/third_party/freetype/src/sfnt/pngshim.h @@ -0,0 +1,49 @@ +/***************************************************************************/ +/* */ +/* pngshim.h */ +/* */ +/* PNG Bitmap glyph support. */ +/* */ +/* Copyright 2013 by Google, Inc. */ +/* Written by Stuart Gill and Behdad Esfahbod. */ +/* */ +/* This file is part of the FreeType project, and may only be used, */ +/* modified, and distributed under the terms of the FreeType project */ +/* license, LICENSE.TXT. By continuing to use, modify, or distribute */ +/* this file you indicate that you have read the license and */ +/* understand and accept it fully. */ +/* */ +/***************************************************************************/ + + +#ifndef __PNGSHIM_H__ +#define __PNGSHIM_H__ + + +#include <ft2build.h> +#include "ttload.h" + + +FT_BEGIN_HEADER + +#ifdef FT_CONFIG_OPTION_USE_PNG + + FT_LOCAL( FT_Error ) + 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_Bool populate_map_and_metrics ); + +#endif + +FT_END_HEADER + +#endif /* __PNGSHIM_H__ */ + + +/* END */ |