summaryrefslogtreecommitdiff
path: root/core/fxge/agg
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-06-08 11:51:23 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-08 11:51:23 -0700
commit7d2a8d966643ebc77c1aa0f0c53a0ffd2d681c4c (patch)
tree5f2823bb9e2a575e39044ebea114f4ed4e5a9368 /core/fxge/agg
parentb7a5179a7cd73d33355e1cece763caf238b7dc22 (diff)
downloadpdfium-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/agg')
-rw-r--r--core/fxge/agg/fx_agg_driver.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index d7a9ddb530..7d197f8c21 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -1096,7 +1096,7 @@ class CFX_Renderer {
}
m_pClipMask = nullptr;
if (m_pClipRgn && m_pClipRgn->GetType() == CFX_ClipRgn::MaskF) {
- m_pClipMask = m_pClipRgn->GetMask();
+ m_pClipMask = m_pClipRgn->GetMask().GetObject();
}
m_bFullCover = bFullCover;
FX_BOOL bObjectCMYK = FXGETFLAG_COLORTYPE(alpha_flag);
@@ -1562,7 +1562,7 @@ FX_BOOL CFX_AggDeviceDriver::SetPixel(int x,
return _DibSetPixel(m_pBitmap, x, y, color, alpha_flag, pIccTransform);
}
} else if (m_pClipRgn->GetType() == CFX_ClipRgn::MaskF) {
- const CFX_DIBitmap* pMask = m_pClipRgn->GetMask();
+ const CFX_DIBitmap* pMask = m_pClipRgn->GetMask().GetObject();
FX_BOOL bCMYK = FXGETFLAG_COLORTYPE(alpha_flag);
int new_alpha =
bCMYK ? FXGETFLAG_ALPHA_FILL(alpha_flag) : FXARGB_A(color);
@@ -1617,7 +1617,7 @@ FX_BOOL CFX_AggDeviceDriver::FillRect(const FX_RECT* pRect,
}
m_pBitmap->CompositeMask(
draw_rect.left, draw_rect.top, draw_rect.Width(), draw_rect.Height(),
- (const CFX_DIBitmap*)m_pClipRgn->GetMask(), fill_color,
+ m_pClipRgn->GetMask().GetObject(), fill_color,
draw_rect.left - clip_rect.left, draw_rect.top - clip_rect.top,
FXDIB_BLEND_NORMAL, nullptr, m_bRgbByteOrder, alpha_flag, pIccTransform);
return TRUE;