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/fpdfapi/fpdf_render/fpdf_render_text.cpp | |
| 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/fpdfapi/fpdf_render/fpdf_render_text.cpp')
| -rw-r--r-- | core/fpdfapi/fpdf_render/fpdf_render_text.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp index 43816c4d99..9e3a6c6587 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp @@ -308,7 +308,8 @@ FX_BOOL CPDF_RenderStatus::ProcessText(const CPDF_TextObject* textobj, flag |= FX_STROKE_TEXT_MODE; } const CPDF_GeneralStateData* pGeneralData = - ((CPDF_PageObject*)textobj)->m_GeneralState; + static_cast<const CPDF_PageObject*>(textobj) + ->m_GeneralState.GetObject(); if (pGeneralData && pGeneralData->m_StrokeAdjust) { flag |= FX_STROKE_ADJUST; } @@ -318,7 +319,8 @@ FX_BOOL CPDF_RenderStatus::ProcessText(const CPDF_TextObject* textobj, return CPDF_TextRenderer::DrawTextPath( m_pDevice, textobj->m_nChars, textobj->m_pCharCodes, textobj->m_pCharPos, pFont, font_size, &text_matrix, pDeviceMatrix, - textobj->m_GraphState, fill_argb, stroke_argb, pClippingPath, flag); + textobj->m_GraphState.GetObject(), fill_argb, stroke_argb, + pClippingPath, flag); } text_matrix.Concat(*pObj2Device); return CPDF_TextRenderer::DrawNormalText( |