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 /core/src/fpdfapi | |
| 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 'core/src/fpdfapi')
| -rw-r--r-- | core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp | 1 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_font/ttgsubtable.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp index 981018b33a..c7110d39c9 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp @@ -610,6 +610,7 @@ FX_DWORD PDF_PredefinedCharCodeFromUnicode(int encoding, FX_WCHAR unicode) extern "C" { #endif extern int FXFT_unicode_from_adobe_name(const char* name); +extern void FXFT_adobe_name_from_unicode(char* glyph_name, FX_WCHAR unicode); #ifdef __cplusplus } #endif diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.h b/core/src/fpdfapi/fpdf_font/ttgsubtable.h index 515b9f9242..c381a01304 100644 --- a/core/src/fpdfapi/fpdf_font/ttgsubtable.h +++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.h @@ -6,7 +6,7 @@ #ifndef TTGSUBTable_H #define TTGSUBTable_H -#include "../../fx_freetype.h" +#include "../../../include/fxge/fx_freetype.h" #include "../../../include/fxcrt/fx_basic.h" #include "common.h" class CFX_GlyphMap |