summaryrefslogtreecommitdiff
path: root/core/src/fpdfapi
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-05-06 14:00:24 -0700
committerLei Zhang <thestig@chromium.org>2015-05-06 14:00:24 -0700
commit903e03a03ad4526252874d8ba15258e7c2955739 (patch)
treed5fb90ecb9ba8e01e1ba45711fce046cc02049c6 /core/src/fpdfapi
parent3cc55de355d2eea165cf5981f1b0f83a118ae9c4 (diff)
downloadpdfium-903e03a03ad4526252874d8ba15258e7c2955739.tar.xz
Merge to XFA: 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/1127163003
Diffstat (limited to 'core/src/fpdfapi')
-rw-r--r--core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp4
1 files 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;
}