diff options
| author | Artem Strygin <art-snake@yandex-team.ru> | 2018-05-31 14:08:11 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-31 14:08:11 +0000 |
| commit | 656eb84f83fc1701737d9c65658371a99428d727 (patch) | |
| tree | 6fb28e4283c1ef8696b42d8b7d200a13c32742fc /fpdfsdk/fpdf_sysfontinfo.cpp | |
| parent | 8f7ee98e2c622c21f452cd9fd5956fe85bcb2b7c (diff) | |
| download | pdfium-656eb84f83fc1701737d9c65658371a99428d727.tar.xz | |
Move codepage/charset methods into related places.
Change-Id: I71417cc5b1bd00f77d42740198cc17487ebd686e
Reviewed-on: https://pdfium-review.googlesource.com/33330
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Art Snake <art-snake@yandex-team.ru>
Diffstat (limited to 'fpdfsdk/fpdf_sysfontinfo.cpp')
| -rw-r--r-- | fpdfsdk/fpdf_sysfontinfo.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fpdfsdk/fpdf_sysfontinfo.cpp b/fpdfsdk/fpdf_sysfontinfo.cpp index 3a3f9e1257..564912b85c 100644 --- a/fpdfsdk/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/fpdf_sysfontinfo.cpp @@ -9,6 +9,7 @@ #include <memory> #include "core/fxcrt/fx_codepage.h" +#include "core/fxge/cfx_font.h" #include "core/fxge/cfx_fontmapper.h" #include "core/fxge/cfx_fontmgr.h" #include "core/fxge/cfx_gemodule.h" @@ -30,6 +31,8 @@ static_assert(FXFONT_GB2312_CHARSET == FX_CHARSET_ChineseSimplified, "Charset must match"); static_assert(FXFONT_CHINESEBIG5_CHARSET == FX_CHARSET_ChineseTraditional, "Charset must match"); +static_assert(sizeof(CFX_Font::CharsetFontMap) == sizeof(FPDF_CharsetFontMap), + "CFX_Font::CharsetFontMap should be same as FPDF_CharsetFontMap"); class CFX_ExternalFontInfo final : public SystemFontInfoIface { public: @@ -122,7 +125,7 @@ FPDF_SetSystemFontInfo(FPDF_SYSFONTINFO* pFontInfoExt) { } FPDF_EXPORT const FPDF_CharsetFontMap* FPDF_CALLCONV FPDF_GetDefaultTTFMap() { - return CPWL_FontMap::defaultTTFMap; + return reinterpret_cast<const FPDF_CharsetFontMap*>(CFX_Font::defaultTTFMap); } struct FPDF_SYSFONTINFO_DEFAULT : public FPDF_SYSFONTINFO { |