commit d10348e27d91ba5525523a3a3491053c8e44f94e
author Lei Zhang <thestig@chromium.org> Thu Apr 23 14:54:04 2015 -0700
committer Lei Zhang <thestig@chromium.org> Thu Apr 23 14:54:04 2015 -0700
tree 17a7108d373d6356e68b0a1993bd872530a3786e
parent 54605bea2fce2a85e6995eb7b844016f3779a205

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/1101203002

core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp

diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
index 79d7351..2e642be 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 @@
     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 @@
     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;
         }