diff options
| author | Wei Li <weili@chromium.org> | 2016-03-28 10:33:33 -0700 |
|---|---|---|
| committer | Wei Li <weili@chromium.org> | 2016-03-28 10:33:33 -0700 |
| commit | 8940993efffaaf432320509555dc61122b8b72b2 (patch) | |
| tree | 2e9c42a78d96061ae06ee052e8a274ccfb8fcec7 /core/fxge | |
| parent | b5e8f14e3eefc5da995b332788d3203cee204883 (diff) | |
| download | pdfium-8940993efffaaf432320509555dc61122b8b72b2.tar.xz | |
Reduce signed/unsigned comparison warnings
The warnings generated by Clang. This is part 1 for some simple cases.
BUG=pdfium:29
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1840483003 .
Diffstat (limited to 'core/fxge')
| -rw-r--r-- | core/fxge/ge/fx_ge_font.cpp | 3 | ||||
| -rw-r--r-- | core/fxge/ge/fx_ge_fontmap.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/fxge/ge/fx_ge_font.cpp b/core/fxge/ge/fx_ge_font.cpp index 04019a059c..fab5ea28a9 100644 --- a/core/fxge/ge/fx_ge_font.cpp +++ b/core/fxge/ge/fx_ge_font.cpp @@ -4,6 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "core/fpdfapi/fpdf_font/include/cpdf_font.h" #include "core/fxge/ge/fx_text_int.h" #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge.h" @@ -516,7 +517,7 @@ uint32_t CFX_UnicodeEncodingEx::CharCodeFromUnicode(FX_WCHAR Unicode) const { return Unicode; } } - return static_cast<uint32_t>(-1); + return CPDF_Font::kInvalidCharCode; } CFX_UnicodeEncodingEx* FX_CreateFontEncodingEx(CFX_Font* pFont, diff --git a/core/fxge/ge/fx_ge_fontmap.cpp b/core/fxge/ge/fx_ge_fontmap.cpp index 709ef0031b..c6a6c5c003 100644 --- a/core/fxge/ge/fx_ge_fontmap.cpp +++ b/core/fxge/ge/fx_ge_fontmap.cpp @@ -1329,12 +1329,12 @@ int CFX_FontMapper::GetFaceSize() const { } FX_BOOL CFX_FontMapper::IsBuiltinFace(const FXFT_Face face) const { - for (int i = 0; i < MM_FACE_COUNT; ++i) { + for (size_t i = 0; i < MM_FACE_COUNT; ++i) { if (m_MMFaces[i] == face) { return TRUE; } } - for (int i = 0; i < FOXIT_FACE_COUNT; ++i) { + for (size_t i = 0; i < FOXIT_FACE_COUNT; ++i) { if (m_FoxitFaces[i] == face) { return TRUE; } |