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 /core/fxge/ge | |
| 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 'core/fxge/ge')
| -rw-r--r-- | core/fxge/ge/fx_ge_font.cpp | 2 | ||||
| -rw-r--r-- | core/fxge/ge/fx_ge_path.cpp | 4 | ||||
| -rw-r--r-- | core/fxge/ge/fx_ge_text.cpp | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/core/fxge/ge/fx_ge_font.cpp b/core/fxge/ge/fx_ge_font.cpp index 67b968b44d..098195dded 100644 --- a/core/fxge/ge/fx_ge_font.cpp +++ b/core/fxge/ge/fx_ge_font.cpp @@ -522,7 +522,7 @@ FX_DWORD CFX_UnicodeEncodingEx::CharCodeFromUnicode(FX_WCHAR Unicode) const { return Unicode; } } - return -1; + return static_cast<FX_DWORD>(-1); } CFX_UnicodeEncodingEx* FX_CreateFontEncodingEx(CFX_Font* pFont, diff --git a/core/fxge/ge/fx_ge_path.cpp b/core/fxge/ge/fx_ge_path.cpp index 0b52cdf9e4..de84de2518 100644 --- a/core/fxge/ge/fx_ge_path.cpp +++ b/core/fxge/ge/fx_ge_path.cpp @@ -340,7 +340,9 @@ CFX_FloatRect CFX_PathData::GetBoundingBox(FX_FLOAT line_width, -100000 * 1.0f); int iPoint = 0; FX_FLOAT half_width = line_width; - int iStartPoint, iEndPoint, iMiddlePoint; + int iStartPoint = 0; + int iEndPoint = 0; + int iMiddlePoint = 0; FX_BOOL bJoin; while (iPoint < m_PointCount) { if (m_pPoints[iPoint].m_Flag == FXPT_MOVETO) { diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp index 3f001d2f96..bcc630ca71 100644 --- a/core/fxge/ge/fx_ge_text.cpp +++ b/core/fxge/ge/fx_ge_text.cpp @@ -375,7 +375,10 @@ FX_BOOL CFX_RenderDevice::DrawNormalText(int nChars, uint8_t* dest_buf = bitmap.GetBuffer(); int dest_pitch = bitmap.GetPitch(); int Bpp = bitmap.GetBPP() / 8; - int a, r, g, b; + int a = 0; + int r = 0; + int g = 0; + int b = 0; if (anti_alias == FXFT_RENDER_MODE_LCD) { _Color2Argb(fill_color, fill_color, alpha_flag | (1 << 24), pIccTransform); ArgbDecode(fill_color, a, r, g, b); |