diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:04:26 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:04:26 -0700 |
commit | 4eb4d7f6c707cc2c23c806aa540d055c8832b55d (patch) | |
tree | 43b7a7fac7b4ce08c287bfc03d09e5e1201e20d0 /core/src/fxge/dib/fx_dib_main.cpp | |
parent | 7cc97521db1e52d5927f5605de5f9a7102f8af40 (diff) | |
download | pdfium-4eb4d7f6c707cc2c23c806aa540d055c8832b55d.tar.xz |
Revert "Fix else-after-returns throughout pdfium."
This reverts commit 7cc97521db1e52d5927f5605de5f9a7102f8af40.
Diffstat (limited to 'core/src/fxge/dib/fx_dib_main.cpp')
-rw-r--r-- | core/src/fxge/dib/fx_dib_main.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp index 8a864f10a1..82a14974f4 100644 --- a/core/src/fxge/dib/fx_dib_main.cpp +++ b/core/src/fxge/dib/fx_dib_main.cpp @@ -1033,8 +1033,10 @@ FX_DWORD CFX_DIBitmap::GetPixel(int x, int y) const case FXDIB_1bppRgb: { if ((*pos) & (1 << (7 - x % 8))) { return m_pPalette ? m_pPalette[1] : 0xffffffff; + } else { + return m_pPalette ? m_pPalette[0] : 0xff000000; } - return m_pPalette ? m_pPalette[0] : 0xff000000; + break; } case FXDIB_8bppMask: return (*pos) << 24; @@ -1586,8 +1588,7 @@ FX_BOOL CFX_ImageRenderer::Continue(IFX_Pause* pPause) { if (m_Status == 1) { return m_Stretcher.Continue(pPause); - } - if (m_Status == 2) { + } else if (m_Status == 2) { if (m_pTransformer->Continue(pPause)) { return TRUE; } |