From e4fc5ced45c8fcfbe2487ec64eab036bc7d57602 Mon Sep 17 00:00:00 2001 From: Bo Xu Date: Fri, 19 Dec 2014 14:29:17 -0800 Subject: 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 --- core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp | 1 + core/src/fpdfapi/fpdf_font/ttgsubtable.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'core/src/fpdfapi') 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 -- cgit v1.2.3