diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-12 22:21:30 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-12 22:21:30 -0800 |
| commit | bde53d25de8cba5657aa7f63a301288663fa58e5 (patch) | |
| tree | f293739c7217fe0757c0b9737c0343d391b3dea3 /core/src/fpdfapi/fpdf_font | |
| parent | d46f1c83038bbe05e5ad072f157b830b03706e8b (diff) | |
| download | pdfium-bde53d25de8cba5657aa7f63a301288663fa58e5.tar.xz | |
Merge to XFA: Remove relative includes.
That refer to parent directories.
TBR=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1434223002 .
(cherry picked from commit 22bc4227fbbda5a5e9abad2a2c0a98c04fe7f228)
Review URL: https://codereview.chromium.org/1439223003 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_font')
| -rw-r--r-- | core/src/fpdfapi/fpdf_font/fpdf_font.cpp | 9 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp index fb0f628147..9f83da062c 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp @@ -6,13 +6,17 @@ #include "font_int.h" -#include "../fpdf_page/pageint.h" +#include "core/src/fpdfapi/fpdf_page/pageint.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfapi/fpdf_page.h" #include "core/include/fpdfapi/fpdf_pageobj.h" #include "core/include/fpdfapi/fpdf_resource.h" #include "core/include/fxge/fx_freetype.h" +#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#include "core/src/fxge/apple/apple_int.h" +#endif + FX_BOOL FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id) { for (int i = 0; i < FXFT_Get_Face_CharmapCount(face); i++) { if (FXFT_Get_Charmap_PlatformID(FXFT_Get_Face_Charmaps(face)[i]) == @@ -1049,9 +1053,6 @@ static FX_BOOL FT_UseType1Charmap(FXFT_Face face) { } return TRUE; } -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ -#include "../../fxge/apple/apple_int.h" -#endif int CPDF_Type1Font::GlyphFromCharCodeExt(FX_DWORD charcode) { if (charcode > 0xff) { return -1; diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp index 1ecb6a6d12..65b4b781b1 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -6,12 +6,12 @@ #include "font_int.h" -#include "../fpdf_cmaps/cmap_int.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfapi/fpdf_page.h" #include "core/include/fpdfapi/fpdf_resource.h" #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge.h" +#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h" namespace { |