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/fpdfapi/fpdf_render/fpdf_render_loadimage.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/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp')
-rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index 7d17e78e24..ce29baf738 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -21,17 +21,13 @@ unsigned int _GetBits8(const uint8_t* pData, int bitpos, int nbits) unsigned int byte = pData[bitpos / 8]; if (nbits == 8) { return byte; - } - if (nbits == 4) { + } else if (nbits == 4) { return (bitpos % 8) ? (byte & 0x0f) : (byte >> 4); - } - if (nbits == 2) { + } else if (nbits == 2) { return (byte >> (6 - bitpos % 8)) & 0x03; - } - if (nbits == 1) { + } else if (nbits == 1) { return (byte >> (7 - bitpos % 8)) & 0x01; - } - if (nbits == 16) { + } else if (nbits == 16) { return byte * 256 + pData[bitpos / 8 + 1]; } return 0; @@ -466,8 +462,7 @@ int CPDF_DIBSource::ContinueLoadDIBSource(IFX_Pause* pPause) m_pColorSpace->EnableStdConversion(FALSE); } return ret1; - } - if (m_Status == 2) { + } else if (m_Status == 2) { return ContinueLoadMaskDIB(pPause); } return 0; @@ -1013,8 +1008,7 @@ void CPDF_DIBSource::TranslateScanline24bpp(uint8_t* dest_scan, const uint8_t* s break; } return; - } - if (m_bpc == 8) { + } else if (m_bpc == 8) { if (m_nComponents == m_pColorSpace->CountComponents()) m_pColorSpace->TranslateImageLine(dest_scan, src_scan, m_Width, m_Width, m_Height, m_bLoadMask && m_GroupFamily == PDFCS_DEVICECMYK && m_Family == PDFCS_DEVICECMYK); |