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/fpdfdoc/cpvt_wordinfo.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/fpdfdoc/cpvt_wordinfo.cpp')
| -rw-r--r-- | core/fpdfdoc/cpvt_wordinfo.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/fpdfdoc/cpvt_wordinfo.cpp b/core/fpdfdoc/cpvt_wordinfo.cpp index f1ea11915c..36859c2309 100644 --- a/core/fpdfdoc/cpvt_wordinfo.cpp +++ b/core/fpdfdoc/cpvt_wordinfo.cpp @@ -5,11 +5,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/fpdfdoc/cpvt_wordinfo.h" +#include "core/fxcrt/fx_codepage.h" #include "third_party/base/ptr_util.h" CPVT_WordInfo::CPVT_WordInfo() : Word(0), - nCharset(FXFONT_ANSI_CHARSET), + nCharset(FX_CHARSET_ANSI), fWordX(0.0f), fWordY(0.0f), fWordTail(0.0f), @@ -28,7 +29,7 @@ CPVT_WordInfo::CPVT_WordInfo(uint16_t word, CPVT_WordInfo::CPVT_WordInfo(const CPVT_WordInfo& word) : Word(0), - nCharset(FXFONT_ANSI_CHARSET), + nCharset(FX_CHARSET_ANSI), fWordX(0.0f), fWordY(0.0f), fWordTail(0.0f), |