diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-08-10 00:13:37 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-10 00:13:37 +0000 |
| commit | 4174b5ab6ac9024acb9b42acbb61d628a2a679e3 (patch) | |
| tree | 0d73f6ad6d85fd7fead7fdc6ddfc647479511bcd /core/fxge/dib/cfx_bitmapcomposer.cpp | |
| parent | fd7cede17e027a83de2aff3bc0f5ee875271e444 (diff) | |
| download | pdfium-4174b5ab6ac9024acb9b42acbb61d628a2a679e3.tar.xz | |
Add CFX_DIBSource::GetWritableScanline().
Remove a bunch of const_cast<uint8_t*> or equivalent. This will also
help when we convert to span<>, since casting spans is a nuisance.
Change-Id: I330e5041cbaf33a84425fc4242a3dfacf5ca8011
Reviewed-on: https://pdfium-review.googlesource.com/39831
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge/dib/cfx_bitmapcomposer.cpp')
| -rw-r--r-- | core/fxge/dib/cfx_bitmapcomposer.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/core/fxge/dib/cfx_bitmapcomposer.cpp b/core/fxge/dib/cfx_bitmapcomposer.cpp index 3854949207..22e1bc9b65 100644 --- a/core/fxge/dib/cfx_bitmapcomposer.cpp +++ b/core/fxge/dib/cfx_bitmapcomposer.cpp @@ -112,13 +112,11 @@ void CFX_BitmapComposer::ComposeScanline(int line, m_pClipMask->GetPitch() + (m_DestLeft - m_pClipRgn->GetBox().left); } - uint8_t* dest_scan = - const_cast<uint8_t*>(m_pBitmap->GetScanline(line + m_DestTop)) + - m_DestLeft * m_pBitmap->GetBPP() / 8; + uint8_t* dest_scan = m_pBitmap->GetWritableScanline(line + m_DestTop) + + m_DestLeft * m_pBitmap->GetBPP() / 8; uint8_t* dest_alpha_scan = m_pBitmap->m_pAlphaMask - ? const_cast<uint8_t*>( - m_pBitmap->m_pAlphaMask->GetScanline(line + m_DestTop)) + + ? m_pBitmap->m_pAlphaMask->GetWritableScanline(line + m_DestTop) + m_DestLeft : nullptr; DoCompose(dest_scan, scanline, m_DestWidth, clip_scan, scan_extra_alpha, |