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_facecache.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_facecache.cpp')
| -rw-r--r-- | core/fxge/ge/cfx_facecache.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/fxge/ge/cfx_facecache.cpp b/core/fxge/ge/cfx_facecache.cpp index 2a8e71acf5..0e1dea4bb3 100644 --- a/core/fxge/ge/cfx_facecache.cpp +++ b/core/fxge/ge/cfx_facecache.cpp @@ -10,6 +10,7 @@ #include <limits> #include <memory> +#include "core/fxcrt/fx_codepage.h" #include "core/fxge/cfx_fontmgr.h" #include "core/fxge/cfx_gemodule.h" #include "core/fxge/cfx_pathdata.h" @@ -165,7 +166,7 @@ CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(const CFX_Font* pFont, if (index >= CFX_Font::kWeightPowArraySize) return nullptr; pdfium::base::CheckedNumeric<signed long> level = 0; - if (pSubstFont->m_Charset == FXFONT_SHIFTJIS_CHARSET) + if (pSubstFont->m_Charset == FX_CHARSET_ShiftJIS) level = CFX_Font::s_WeightPow_SHIFTJIS[index] * 2; else level = CFX_Font::s_WeightPow_11[index]; |