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_font.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_font.cpp')
| -rw-r--r-- | core/fxge/ge/cfx_font.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/fxge/ge/cfx_font.cpp b/core/fxge/ge/cfx_font.cpp index 068f0b032c..2ae34f11b9 100644 --- a/core/fxge/ge/cfx_font.cpp +++ b/core/fxge/ge/cfx_font.cpp @@ -13,6 +13,7 @@ #include <vector> #include "core/fpdfapi/font/cpdf_font.h" +#include "core/fxcrt/fx_codepage.h" #include "core/fxge/cfx_facecache.h" #include "core/fxge/cfx_fontcache.h" #include "core/fxge/cfx_fontmgr.h" @@ -644,7 +645,7 @@ CFX_PathData* CFX_Font::LoadGlyphPathImpl(uint32_t glyph_index, uint32_t index = (m_pSubstFont->m_Weight - 400) / 10; index = std::min(index, static_cast<uint32_t>(kWeightPowArraySize - 1)); int level = 0; - if (m_pSubstFont->m_Charset == FXFONT_SHIFTJIS_CHARSET) + if (m_pSubstFont->m_Charset == FX_CHARSET_ShiftJIS) level = s_WeightPow_SHIFTJIS[index] * 2 * 65536 / 36655; else level = s_WeightPow[index] * 2; |