diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-07-21 16:54:32 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-07-21 16:54:32 -0700 |
commit | 587fd358c90319316ba86d4840901a02005f3b83 (patch) | |
tree | b98a3909d3908b742ea7a2b030b859c04d16fe1b /core/src/fpdfapi/fpdf_font/fpdf_font.cpp | |
parent | dcbc02f15e767e7d427fe6346d415c48da53afe0 (diff) | |
download | pdfium-587fd358c90319316ba86d4840901a02005f3b83.tar.xz |
Merge to XFA: Move extern fpdf_font_charset.cpp function prototypes.
(cherry picked from commit c5fa7f2a36ebd4c92c935e1332a2f7db4f3594d9)
Orignal Review URL: https://codereview.chromium.org/1241173004 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1243243003 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_font/fpdf_font.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_font/fpdf_font.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp index e7072e8d55..9ed5d8ff1c 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" #include "../../../include/fpdfapi/fpdf_module.h" +#include "../../../include/fpdfapi/fpdf_page.h" #include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "font_int.h" -#include "../fpdf_page/pageint.h" +#include "../../../include/fpdfapi/fpdf_resource.h" #include "../../../include/fxge/fx_freetype.h" +#include "../fpdf_page/pageint.h" +#include "font_int.h" FX_BOOL FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id) { @@ -22,7 +23,6 @@ FX_BOOL FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id) } return FALSE; } -extern const FX_WORD* PDF_UnicodesForPredefinedCharSet(int); CPDF_FontGlobals::CPDF_FontGlobals() : m_pContrastRamps(NULL) { @@ -816,7 +816,6 @@ FX_BOOL CPDF_Font::IsStandardFont() const } return TRUE; } -extern const FX_CHAR* PDF_CharNameFromPredefinedCharSet(int encoding, uint8_t charcode); CPDF_SimpleFont::CPDF_SimpleFont(int fonttype) : CPDF_Font(fonttype) { FXSYS_memset(m_CharBBox, 0xff, sizeof m_CharBBox); @@ -1419,7 +1418,6 @@ FX_BOOL CPDF_TrueTypeFont::_Load() { return LoadCommon(); } -extern FX_DWORD FT_CharCodeFromUnicode(int encoding, FX_WCHAR unicode); void CPDF_TrueTypeFont::LoadGlyphMap() { if (m_Font.m_Face == NULL) { |