diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-05-06 14:00:24 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-05-06 14:00:24 -0700 |
| commit | 903e03a03ad4526252874d8ba15258e7c2955739 (patch) | |
| tree | d5fb90ecb9ba8e01e1ba45711fce046cc02049c6 | |
| parent | 3cc55de355d2eea165cf5981f1b0f83a118ae9c4 (diff) | |
| download | pdfium-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
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -3,7 +3,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 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; } |