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 15:03:12 -0800 |
| commit | 4c764f391a4cfb82c81117cf9f249a8598be1cc5 (patch) | |
| tree | 7d0cc6e2db4182a12ecab5f528c9bfccb4b7df6e /core/include/fxge | |
| parent | d44e39279b08c0954f07283b4fb3e7f3e292e4de (diff) | |
| download | pdfium-4c764f391a4cfb82c81117cf9f249a8598be1cc5.tar.xz | |
XFA: merge patch from CL 815103002
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 'core/include/fxge')
| -rw-r--r-- | core/include/fxge/fx_freetype.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/include/fxge/fx_freetype.h b/core/include/fxge/fx_freetype.h index 6a2190b2fc..6419c6b6c2 100644 --- a/core/include/fxge/fx_freetype.h +++ b/core/include/fxge/fx_freetype.h @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../thirdparties/freetype/ft2build.h" -#include "../thirdparties/freetype/freetype/freetype.h" -#include "../thirdparties/freetype/freetype/ftoutln.h" -#include "../thirdparties/freetype/freetype/ftmm.h" -#include "../thirdparties/freetype/freetype/internal/ftobjs.h" -#include "../thirdparties/freetype/freetype/tttables.h" +#include "../../../third_party/freetype/include/ft2build.h" +#include "../../../third_party/freetype/include/freetype.h" +#include "../../../third_party/freetype/include/ftoutln.h" +#include "../../../third_party/freetype/include/ftmm.h" +#include "../../../third_party/freetype/include/internal/ftobjs.h" +#include "../../../third_party/freetype/include/tttables.h" #ifdef __cplusplus extern "C" { #endif @@ -137,8 +137,8 @@ typedef FT_CharMap FXFT_CharMap; #define FXFT_Glyph_Get_CBox(glyph, bbox_mode, acbox) FT_Glyph_Get_CBox(glyph, bbox_mode, acbox) #define FXFT_Done_Glyph(glyph) FT_Done_Glyph(glyph) #define FXFT_Library_SetLcdFilter(library, filter) FT_Library_SetLcdFilter((FT_Library)(library), filter) -int FXFT_unicode_from_adobe_name(const char* name); -void FXFT_adobe_name_from_unicode(char* name, unsigned int unicode); +int FXFT_unicode_from_adobe_name(const char* glyph_name); +void FXFT_adobe_name_from_unicode(char* name, wchar_t unicode); #ifdef __cplusplus }; #endif |