diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-10-24 18:38:57 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-24 18:38:57 +0000 |
| commit | 1313ca08f7156898acf09e893e3f0e20d2d85424 (patch) | |
| tree | fd1150556c7b289d990382cec3b60d9f9881742f /core/fpdfapi/render | |
| parent | f4f2b6d45e00c67a3c508618a829330a67b827ba (diff) | |
| download | pdfium-1313ca08f7156898acf09e893e3f0e20d2d85424.tar.xz | |
Make CPDF_PathObject::m_bStroke private.
Remove some setters on newly constructed objects, since |m_bStroke| is
already initialized to false.
Change-Id: I8d04efec997226fb86091566eea96604f18680aa
Reviewed-on: https://pdfium-review.googlesource.com/c/44511
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/render')
| -rw-r--r-- | core/fpdfapi/render/cpdf_renderstatus.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index 6b17e09642..e6623b4166 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp @@ -1244,7 +1244,7 @@ bool CPDF_RenderStatus::ProcessForm(const CPDF_FormObject* pFormObj, bool CPDF_RenderStatus::ProcessPath(CPDF_PathObject* pPathObj, const CFX_Matrix& mtObj2Device) { int FillType = pPathObj->m_FillType; - bool bStroke = pPathObj->m_bStroke; + bool bStroke = pPathObj->stroke(); ProcessPathPattern(pPathObj, mtObj2Device, &FillType, &bStroke); if (FillType == 0 && !bStroke) return true; @@ -1968,7 +1968,6 @@ void CPDF_RenderStatus::DrawTextPathWithPattern(const CPDF_TextObject* textobj, CPDF_PathObject path; std::vector<std::unique_ptr<CPDF_TextObject>> pCopy; pCopy.push_back(std::unique_ptr<CPDF_TextObject>(textobj->Clone())); - path.m_bStroke = false; path.m_FillType = FXFILL_WINDING; path.m_ClipPath.AppendTexts(&pCopy); path.m_ColorState = textobj->m_ColorState; @@ -2007,8 +2006,8 @@ void CPDF_RenderStatus::DrawTextPathWithPattern(const CPDF_TextObject* textobj, matrix.Concat(CFX_Matrix(font_size, 0, 0, font_size, charpos.m_Origin.x, charpos.m_Origin.y)); path.m_Path.Append(pPath, &matrix); - path.m_bStroke = bStroke; path.m_FillType = bFill ? FXFILL_WINDING : 0; + path.set_stroke(bStroke); path.set_matrix(*pTextMatrix); path.CalcBoundingBox(); ProcessPath(&path, mtObj2Device); |