diff options
author | tsepez <tsepez@chromium.org> | 2016-06-08 11:51:23 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-06-08 11:51:23 -0700 |
commit | 7d2a8d966643ebc77c1aa0f0c53a0ffd2d681c4c (patch) | |
tree | 5f2823bb9e2a575e39044ebea114f4ed4e5a9368 /core/fxge/dib | |
parent | b7a5179a7cd73d33355e1cece763caf238b7dc22 (diff) | |
download | pdfium-7d2a8d966643ebc77c1aa0f0c53a0ffd2d681c4c.tar.xz |
Remove implicit CFX_CountedRef::operator T*()
Explicitly invoke GetObject() method instead. This avoids
having code where it looks like non-pointers are assigned to
pointers but works due to the cast operator.
Review-Url: https://codereview.chromium.org/2045083003
Diffstat (limited to 'core/fxge/dib')
-rw-r--r-- | core/fxge/dib/fx_dib_composite.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fxge/dib/fx_dib_composite.cpp b/core/fxge/dib/fx_dib_composite.cpp index 28f6e49044..afb0551b98 100644 --- a/core/fxge/dib/fx_dib_composite.cpp +++ b/core/fxge/dib/fx_dib_composite.cpp @@ -4508,7 +4508,7 @@ FX_BOOL CFX_DIBitmap::CompositeBitmap(int dest_left, FX_RECT clip_box; if (pClipRgn && pClipRgn->GetType() != CFX_ClipRgn::RectI) { ASSERT(pClipRgn->GetType() == CFX_ClipRgn::MaskF); - pClipMask = pClipRgn->GetMask(); + pClipMask = pClipRgn->GetMask().GetObject(); clip_box = pClipRgn->GetBox(); } CFX_ScanlineCompositor compositor; @@ -4587,7 +4587,7 @@ FX_BOOL CFX_DIBitmap::CompositeMask(int dest_left, FX_RECT clip_box; if (pClipRgn && pClipRgn->GetType() != CFX_ClipRgn::RectI) { ASSERT(pClipRgn->GetType() == CFX_ClipRgn::MaskF); - pClipMask = pClipRgn->GetMask(); + pClipMask = pClipRgn->GetMask().GetObject(); clip_box = pClipRgn->GetBox(); } int src_bpp = pMask->GetBPP(); @@ -4870,7 +4870,7 @@ void CFX_BitmapComposer::Compose(CFX_DIBitmap* pDest, m_MaskColor = mask_color; m_pClipMask = nullptr; if (pClipRgn && pClipRgn->GetType() != CFX_ClipRgn::RectI) { - m_pClipMask = pClipRgn->GetMask(); + m_pClipMask = pClipRgn->GetMask().GetObject(); } m_bVertical = bVertical; m_bFlipX = bFlipX; |