diff options
| author | weili <weili@chromium.org> | 2016-03-31 15:08:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-31 15:08:27 -0700 |
| commit | 47ca692c8150cb39abef5737e866b91e6a105b80 (patch) | |
| tree | cba8531fe7a569cfa7f05dc84f158bf1cf15be23 /core/fxge/ge | |
| parent | de0d852ed91973deda41f949e132b12a2efff1ef (diff) | |
| download | pdfium-47ca692c8150cb39abef5737e866b91e6a105b80.tar.xz | |
Re-enable all the windows warnings except 4267
The code is changed or had been changed to no longer generate these
warnings. It is safe to re-enabled these warnings.
In this code change, we fixed some code which generates warnings 4018
(signed/unsigned mismatch) and 4146 (unary minus operator applied to
unsigned type, result still unsigned).
Warning 4333 (right shift by too large amount, data loss) and 4345
(an object of POD type constructed with an initializer of the form ()
will be default-initialized) are no longer generated.
The same setting is applied and verified for GN build as well.
BUG=pdfium:29
Review URL: https://codereview.chromium.org/1849443003
Diffstat (limited to 'core/fxge/ge')
| -rw-r--r-- | core/fxge/ge/fx_ge_fontmap.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/fxge/ge/fx_ge_fontmap.cpp b/core/fxge/ge/fx_ge_fontmap.cpp index c6a6c5c003..c6b208c624 100644 --- a/core/fxge/ge/fx_ge_fontmap.cpp +++ b/core/fxge/ge/fx_ge_fontmap.cpp @@ -681,15 +681,17 @@ void CFX_FontMapper::SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo) { } m_pFontInfo = pFontInfo; } + static CFX_ByteString GetStringFromTable(const uint8_t* string_ptr, uint32_t string_ptr_length, uint16_t offset, uint16_t length) { - if (string_ptr_length < offset + length) { + if (string_ptr_length < static_cast<uint32_t>(offset + length)) { return CFX_ByteString(); } return CFX_ByteStringC(string_ptr + offset, length); } + CFX_ByteString GetNameFromTT(const uint8_t* name_table, uint32_t name_table_size, uint32_t name_id) { |