diff options
| author | Wei Li <weili@chromium.org> | 2016-03-21 11:20:44 -0700 |
|---|---|---|
| committer | Wei Li <weili@chromium.org> | 2016-03-21 11:20:44 -0700 |
| commit | d4e8f1222ca17b57ac74019b2fc3706e1192645c (patch) | |
| tree | 0dd5e1627fd684205631f875cbf5946178177766 /fpdfsdk/fxedit/fxet_ap.cpp | |
| parent | 34fa8d90ae2f60fae219e4dbeff14c053d2e8eef (diff) | |
| download | pdfium-d4e8f1222ca17b57ac74019b2fc3706e1192645c.tar.xz | |
Re-enable several MSVC warnings
Re-enable the following warnings:
4245: signed/unsigned conversion mismatch;
4310: cast may truncate data;
4389: operator on signed/unsigned mismatch;
4701: use potentially uninitialized local variable;
4706: assignment within conditional expression
Clean up the code to avoid those warnings.
BUG=pdfium:29
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1801383002 .
Diffstat (limited to 'fpdfsdk/fxedit/fxet_ap.cpp')
| -rw-r--r-- | fpdfsdk/fxedit/fxet_ap.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fpdfsdk/fxedit/fxet_ap.cpp b/fpdfsdk/fxedit/fxet_ap.cpp index 6f064b2ce8..5bf61365c5 100644 --- a/fpdfsdk/fxedit/fxet_ap.cpp +++ b/fpdfsdk/fxedit/fxet_ap.cpp @@ -18,12 +18,10 @@ CFX_ByteString GetPDFWordString(IFX_Edit_FontMap* pFontMap, if (SubWord > 0) { Word = SubWord; } else { - FX_DWORD dwCharCode = -1; - - if (pPDFFont->IsUnicodeCompatible()) - dwCharCode = pPDFFont->CharCodeFromUnicode(Word); - else - dwCharCode = pFontMap->CharCodeFromUnicode(nFontIndex, Word); + FX_DWORD dwCharCode = + pPDFFont->IsUnicodeCompatible() + ? pPDFFont->CharCodeFromUnicode(Word) + : pFontMap->CharCodeFromUnicode(nFontIndex, Word); if (dwCharCode > 0) { pPDFFont->AppendChar(sWord, dwCharCode); |