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/ge | |
| 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/ge')
| -rw-r--r-- | core/fxge/ge/fx_ge_path.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fxge/ge/fx_ge_path.cpp b/core/fxge/ge/fx_ge_path.cpp index 2abc45f499..6eb41d3094 100644 --- a/core/fxge/ge/fx_ge_path.cpp +++ b/core/fxge/ge/fx_ge_path.cpp @@ -42,7 +42,7 @@ void CFX_ClipRgn::IntersectRect(const FX_RECT& rect) { void CFX_ClipRgn::IntersectMaskRect(FX_RECT rect, FX_RECT mask_rect, CFX_DIBitmapRef Mask) { - const CFX_DIBitmap* mask_dib = Mask; + const CFX_DIBitmap* mask_dib = Mask.GetObject(); m_Type = MaskF; m_Box = rect; m_Box.Intersect(mask_rect); @@ -70,7 +70,7 @@ void CFX_ClipRgn::IntersectMaskRect(FX_RECT rect, } } void CFX_ClipRgn::IntersectMaskF(int left, int top, CFX_DIBitmapRef Mask) { - const CFX_DIBitmap* mask_dib = Mask; + const CFX_DIBitmap* mask_dib = Mask.GetObject(); ASSERT(mask_dib->GetFormat() == FXDIB_8bppMask); FX_RECT mask_box(left, top, left + mask_dib->GetWidth(), top + mask_dib->GetHeight()); @@ -93,7 +93,7 @@ void CFX_ClipRgn::IntersectMaskF(int left, int top, CFX_DIBitmapRef Mask) { return; } new_dib->Create(new_box.Width(), new_box.Height(), FXDIB_8bppMask); - const CFX_DIBitmap* old_dib = m_Mask; + const CFX_DIBitmap* old_dib = m_Mask.GetObject(); for (int row = new_box.top; row < new_box.bottom; row++) { uint8_t* old_scan = old_dib->GetBuffer() + (row - m_Box.top) * old_dib->GetPitch(); |