diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-04-19 12:46:53 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-04-19 17:08:38 +0000 |
| commit | f51a02a29e10fcc490ba28f44d43f50104f940ed (patch) | |
| tree | 354215ff5deeea419ce5a88b369535b5e4468a62 /core/fxge/ge/cfx_unicodeencoding.cpp | |
| parent | 2a473dbecab2b47c513de9127a2cddf4c2800306 (diff) | |
| download | pdfium-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 'core/fxge/ge/cfx_unicodeencoding.cpp')
| -rw-r--r-- | core/fxge/ge/cfx_unicodeencoding.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/fxge/ge/cfx_unicodeencoding.cpp b/core/fxge/ge/cfx_unicodeencoding.cpp index cba67ba354..494ae33bb0 100644 --- a/core/fxge/ge/cfx_unicodeencoding.cpp +++ b/core/fxge/ge/cfx_unicodeencoding.cpp @@ -6,6 +6,7 @@ #include "core/fxge/cfx_unicodeencoding.h" +#include "core/fxcrt/fx_codepage.h" #include "core/fxge/fx_font.h" #include "core/fxge/fx_freetype.h" @@ -22,7 +23,7 @@ uint32_t CFX_UnicodeEncoding::GlyphFromCharCode(uint32_t charcode) { return FXFT_Get_Char_Index(face, charcode); if (m_pFont->GetSubstFont() && - m_pFont->GetSubstFont()->m_Charset == FXFONT_SYMBOL_CHARSET) { + m_pFont->GetSubstFont()->m_Charset == FX_CHARSET_Symbol) { uint32_t index = 0; if (FXFT_Select_Charmap(face, FXFT_ENCODING_MS_SYMBOL) == 0) index = FXFT_Get_Char_Index(face, charcode); |