diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:14:14 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:14:14 -0700 |
| commit | 3c012fef2bb72c8ec1faa73e11ee35539b2559d6 (patch) | |
| tree | b88cb30a45a615b89cdb380f1f62d270ce540fb9 /core/src/fxge/dib/fx_dib_main.cpp | |
| parent | 4eb4d7f6c707cc2c23c806aa540d055c8832b55d (diff) | |
| download | pdfium-3c012fef2bb72c8ec1faa73e11ee35539b2559d6.tar.xz | |
Re-land else-after-returns
Revert "Revert "Fix else-after-returns throughout pdfium.""
This reverts commit 4eb4d7f6c707cc2c23c806aa540d055c8832b55d.
Fix one naming conflict.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1243953004 .
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, 3 insertions, 4 deletions
diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp index 82a14974f4..8a864f10a1 100644 --- a/core/src/fxge/dib/fx_dib_main.cpp +++ b/core/src/fxge/dib/fx_dib_main.cpp @@ -1033,10 +1033,8 @@ 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; } - break; + return m_pPalette ? m_pPalette[0] : 0xff000000; } case FXDIB_8bppMask: return (*pos) << 24; @@ -1588,7 +1586,8 @@ FX_BOOL CFX_ImageRenderer::Continue(IFX_Pause* pPause) { if (m_Status == 1) { return m_Stretcher.Continue(pPause); - } else if (m_Status == 2) { + } + if (m_Status == 2) { if (m_pTransformer->Continue(pPause)) { return TRUE; } |