diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-23 14:42:09 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-23 14:42:09 -0700 |
| commit | 2f2ffece124e4ed4b96d2846263015d4b5ad6c00 (patch) | |
| tree | 6966e44279e8d9e1516b7c71219cf66f77a89ca2 /core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | |
| parent | d07958fd2d1c4134d865f4ccb056eb925aaa7d2a (diff) | |
| download | pdfium-2f2ffece124e4ed4b96d2846263015d4b5ad6c00.tar.xz | |
Merge to XFA - else after returns.
(cherry picked from commit 3c012fef2bb72c8ec1faa73e11ee35539b2559d6)
Original Review URL: https://codereview.chromium.org/1243953004 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1239313005 .
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, 12 insertions, 6 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index ce29baf738..7d17e78e24 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -21,13 +21,17 @@ unsigned int _GetBits8(const uint8_t* pData, int bitpos, int nbits) unsigned int byte = pData[bitpos / 8]; if (nbits == 8) { return byte; - } else if (nbits == 4) { + } + if (nbits == 4) { return (bitpos % 8) ? (byte & 0x0f) : (byte >> 4); - } else if (nbits == 2) { + } + if (nbits == 2) { return (byte >> (6 - bitpos % 8)) & 0x03; - } else if (nbits == 1) { + } + if (nbits == 1) { return (byte >> (7 - bitpos % 8)) & 0x01; - } else if (nbits == 16) { + } + if (nbits == 16) { return byte * 256 + pData[bitpos / 8 + 1]; } return 0; @@ -462,7 +466,8 @@ int CPDF_DIBSource::ContinueLoadDIBSource(IFX_Pause* pPause) m_pColorSpace->EnableStdConversion(FALSE); } return ret1; - } else if (m_Status == 2) { + } + if (m_Status == 2) { return ContinueLoadMaskDIB(pPause); } return 0; @@ -1008,7 +1013,8 @@ void CPDF_DIBSource::TranslateScanline24bpp(uint8_t* dest_scan, const uint8_t* s break; } return; - } else if (m_bpc == 8) { + } + 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); |