diff options
| author | Oliver Chang <ochang@chromium.org> | 2016-01-29 18:32:02 -0800 |
|---|---|---|
| committer | Oliver Chang <ochang@chromium.org> | 2016-01-29 18:32:02 -0800 |
| commit | 57123944df5d7388036f70ef164a103b67dc9258 (patch) | |
| tree | 8469e1888e91eed630d122f62fbbc03832e840b9 /core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp | |
| parent | 8f952279866afb647b7098c0cbdc25e35e8c0531 (diff) | |
| download | pdfium-57123944df5d7388036f70ef164a103b67dc9258.tar.xz | |
Merge to XFA: Some cleanup of fpdf_render_loadimage.cpp
- Generalise GetBits8()
- Get rid of C-style casts.
- Make CFX_DIBSource::SetDownSampleSize() non const. It's only overriden
once and called in one place and it doesn't make sense for it to be const.
- Get rid of a macro
- Make public member vars of CPDF_DIBSource private
- And others...
TBR=thestig@chromium.org
Original Review URL: https://codereview.chromium.org/1644403003 .
(cherry picked from commit 487935f662ba4711caf1c2c06873b676fd3fba3e)
Review URL: https://codereview.chromium.org/1649243002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp index 3e5e27088f..a9294acff4 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp @@ -292,7 +292,7 @@ int CPDF_ImageCacheEntry::StartGetCachedBitmap(CPDF_Dictionary* pFormResources, return 0; } void CPDF_ImageCacheEntry::ContinueGetCachedBitmap() { - m_MatteColor = ((CPDF_DIBSource*)m_pCurBitmap)->m_MatteColor; + m_MatteColor = ((CPDF_DIBSource*)m_pCurBitmap)->GetMatteColor(); m_pCurMask = ((CPDF_DIBSource*)m_pCurBitmap)->DetachMask(); CPDF_RenderContext* pContext = m_pRenderStatus->GetContext(); CPDF_PageRenderCache* pPageRenderCache = pContext->GetPageCache(); |