summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-04-21 18:35:03 -0700
committerLei Zhang <thestig@chromium.org>2015-04-21 18:35:03 -0700
commit97d10aff654e42c1b7c3d2abf33fbcf8d341799e (patch)
treef8e68a0ec22b9ce61d610d70fc1dc61cab2bccf5
parentb014ca072970973164e0b3d244fbd8863dff2738 (diff)
downloadpdfium-chromium/2383.tar.xz
This regressed in commit 3f41851 due to shadow variables. BUG=478164 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1101443004
-rw-r--r--DEPS2
-rw-r--r--core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 6be5e57363..15f9d54099 100644
--- a/DEPS
+++ b/DEPS
@@ -5,7 +5,7 @@ deps = {
"https://chromium.googlesource.com/external/gyp",
"testing/corpus":
- "https://pdfium.googlesource.com/pdfium_tests@e733fe1d98fad50c9b5f4023f08db429143b1291",
+ "https://pdfium.googlesource.com/pdfium_tests@73e1d0c915fe574a470fcbc76dd36246ac9fec45",
"testing/gmock":
"https://chromium.googlesource.com/external/googlemock.git@29763965ab52f24565299976b936d1265cb6a271",
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
index 72719d3618..7093edae47 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;
}