From c619ea6d1222965349c2d35ef2fd09fa851fab49 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 23 Apr 2015 13:20:16 -0700 Subject: Fix a regression with cut off images. This regressed in commit 3f41851 due to shadow variables. BUG=478164 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1101443004 (cherry picked from commit 97d10aff654e42c1b7c3d2abf33fbcf8d341799e) Review URL: https://codereview.chromium.org/1104713003 --- core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index 79d73518a1..2e642bed1e 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -238,7 +238,7 @@ FX_BOOL CPDF_DIBSource::Load(CPDF_Document* pDoc, const CPDF_Stream* pStream, CP if (m_bColorKey) { m_bpp = 32; m_AlphaFlag = 2; - FX_SAFE_DWORD pitch = CalculatePitch32(m_bpp, m_Width); + pitch = CalculatePitch32(m_bpp, m_Width); if (!pitch.IsValid()) { return FALSE; } @@ -282,7 +282,7 @@ int CPDF_DIBSource::ContinueToLoadMask() if (m_bColorKey) { m_bpp = 32; m_AlphaFlag = 2; - FX_SAFE_DWORD pitch = CalculatePitch32(m_bpp, m_Width); + pitch = CalculatePitch32(m_bpp, m_Width); if (!pitch.IsValid()) { return 0; } -- cgit v1.2.3