summaryrefslogtreecommitdiff
path: root/xfa/fgas/font/cfgas_fontmgr.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-04-19 12:46:53 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-04-19 17:08:38 +0000
commitf51a02a29e10fcc490ba28f44d43f50104f940ed (patch)
tree354215ff5deeea419ce5a88b369535b5e4468a62 /xfa/fgas/font/cfgas_fontmgr.cpp
parent2a473dbecab2b47c513de9127a2cddf4c2800306 (diff)
downloadpdfium-f51a02a29e10fcc490ba28f44d43f50104f940ed.tar.xz
Cleanup codepage and charset definitions.
This Cl cleans up the unused defines in fx_codepage.h. The FXFONT_CHARSET_ defines are replaced with fx_codepage defines, this moves fx_codepage into core instead of xfa only. Static asserts are added to verify the public/ charsets match the fx_codepage charsets. Change-Id: Ie2f749e093de60a9a6743128a1fb087912e4cc96 Reviewed-on: https://pdfium-review.googlesource.com/4316 Commit-Queue: dsinclair <dsinclair@chromium.org> Commit-Queue: Nicolás Peña <npm@chromium.org> Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'xfa/fgas/font/cfgas_fontmgr.cpp')
-rw-r--r--xfa/fgas/font/cfgas_fontmgr.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp
index d1c4b3d580..e0b71118d9 100644
--- a/xfa/fgas/font/cfgas_fontmgr.cpp
+++ b/xfa/fgas/font/cfgas_fontmgr.cpp
@@ -38,7 +38,7 @@ const FX_CHARSET_MAP g_FXCharset2CodePageTable[] = {
{FX_CHARSET_MAC_ShiftJIS, FX_CODEPAGE_MAC_ShiftJIS},
{FX_CHARSET_MAC_Korean, FX_CODEPAGE_MAC_Korean},
{FX_CHARSET_MAC_ChineseSimplified, FX_CODEPAGE_MAC_ChineseSimplified},
- {FX_CHARSET_MAC_ChineseTriditional, FX_CODEPAGE_MAC_ChineseTraditional},
+ {FX_CHARSET_MAC_ChineseTraditional, FX_CODEPAGE_MAC_ChineseTraditional},
{FX_CHARSET_MAC_Hebrew, FX_CODEPAGE_MAC_Hebrew},
{FX_CHARSET_MAC_Arabic, FX_CODEPAGE_MAC_Arabic},
{FX_CHARSET_MAC_Greek, FX_CODEPAGE_MAC_Greek},
@@ -47,10 +47,10 @@ const FX_CHARSET_MAP g_FXCharset2CodePageTable[] = {
{FX_CHARSET_MAC_EasternEuropean, FX_CODEPAGE_MAC_EasternEuropean},
{FX_CHARSET_MAC_Cyrillic, FX_CODEPAGE_MAC_Cyrillic},
{FX_CHARSET_ShiftJIS, FX_CODEPAGE_ShiftJIS},
- {FX_CHARSET_Korean, FX_CODEPAGE_Korean},
+ {FX_CHARSET_Hangul, FX_CODEPAGE_Hangul},
{FX_CHARSET_Johab, FX_CODEPAGE_Johab},
{FX_CHARSET_ChineseSimplified, FX_CODEPAGE_ChineseSimplified},
- {FX_CHARSET_ChineseTriditional, FX_CODEPAGE_ChineseTraditional},
+ {FX_CHARSET_ChineseTraditional, FX_CODEPAGE_ChineseTraditional},
{FX_CHARSET_MSWin_Greek, FX_CODEPAGE_MSWin_Greek},
{FX_CHARSET_MSWin_Turkish, FX_CODEPAGE_MSWin_Turkish},
{FX_CHARSET_MSWin_Vietnamese, FX_CODEPAGE_MSWin_Vietnamese},
@@ -59,7 +59,7 @@ const FX_CHARSET_MAP g_FXCharset2CodePageTable[] = {
{FX_CHARSET_MSWin_Baltic, FX_CODEPAGE_MSWin_Baltic},
{FX_CHARSET_MSWin_Cyrillic, FX_CODEPAGE_MSWin_Cyrillic},
{FX_CHARSET_Thai, FX_CODEPAGE_MSDOS_Thai},
- {FX_CHARSET_MSWin_EasterEuropean, FX_CODEPAGE_MSWin_EasternEuropean},
+ {FX_CHARSET_MSWin_EasternEuropean, FX_CODEPAGE_MSWin_EasternEuropean},
{FX_CHARSET_US, FX_CODEPAGE_MSDOS_US},
{FX_CHARSET_OEM, FX_CODEPAGE_MSDOS_WesternEuropean},
};
@@ -473,7 +473,7 @@ const uint16_t g_CodePages[] = {FX_CODEPAGE_MSWin_WesternEuropean,
FX_CODEPAGE_MSDOS_Thai,
FX_CODEPAGE_ShiftJIS,
FX_CODEPAGE_ChineseSimplified,
- FX_CODEPAGE_Korean,
+ FX_CODEPAGE_Hangul,
FX_CODEPAGE_ChineseTraditional,
FX_CODEPAGE_Johab,
FX_CODEPAGE_DefANSI,
@@ -547,7 +547,7 @@ struct FX_BIT2CHARSET {
const FX_BIT2CHARSET g_FX_Bit2Charset[4][16] = {
{{1 << 0, FX_CHARSET_ANSI},
- {1 << 1, FX_CHARSET_MSWin_EasterEuropean},
+ {1 << 1, FX_CHARSET_MSWin_EasternEuropean},
{1 << 2, FX_CHARSET_MSWin_Cyrillic},
{1 << 3, FX_CHARSET_MSWin_Greek},
{1 << 4, FX_CHARSET_MSWin_Turkish},
@@ -565,8 +565,8 @@ const FX_BIT2CHARSET g_FX_Bit2Charset[4][16] = {
{{1 << 0, FX_CHARSET_Thai},
{1 << 1, FX_CHARSET_ShiftJIS},
{1 << 2, FX_CHARSET_ChineseSimplified},
- {1 << 3, FX_CHARSET_Korean},
- {1 << 4, FX_CHARSET_ChineseTriditional},
+ {1 << 3, FX_CHARSET_Hangul},
+ {1 << 4, FX_CHARSET_ChineseTraditional},
{1 << 5, FX_CHARSET_Johab},
{1 << 6, FX_CHARSET_Default},
{1 << 7, FX_CHARSET_Default},
@@ -970,7 +970,7 @@ CFX_RetainPtr<IFX_SeekableReadStream> CFGAS_FontMgr::CreateFontStream(
uint32_t index) {
int iExact = 0;
void* hFont =
- pSystemFontInfo->MapFont(0, 0, FXFONT_DEFAULT_CHARSET, 0,
+ pSystemFontInfo->MapFont(0, 0, FX_CHARSET_Default, 0,
pFontMapper->GetFaceName(index).c_str(), iExact);
if (!hFont)
return nullptr;