diff options
| author | wileyrya <wileyrr@gmail.com> | 2017-05-26 09:26:27 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-05-26 16:16:52 +0000 |
| commit | 22a237fb403d76d65a254c4f9cf1c1a9d0b22772 (patch) | |
| tree | ae2888307c024ece316778b3cc7fedca8f4f658a /core | |
| parent | 1bbcb35e4e5593998837c832eabf16a91a695387 (diff) | |
| download | pdfium-22a237fb403d76d65a254c4f9cf1c1a9d0b22772.tar.xz | |
Add public API for setting LineJoin and LineCap on a path
BUG=pdfium:718
R=npm@chromium.org
Change-Id: Icdc1546c87a676a7d05330dece2c5eacd92c0c92
Reviewed-on: https://pdfium-review.googlesource.com/5951
Reviewed-by: Nicolás Peña <npm@chromium.org>
Commit-Queue: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp | 6 | ||||
| -rw-r--r-- | core/fxge/ge/cfx_graphstate.cpp | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp index fe65e5916c..6643035b09 100644 --- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp +++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp @@ -215,6 +215,12 @@ void CPDF_PageContentGenerator::ProcessGraphics(CFX_ByteTextBuf* buf, float lineWidth = pPageObj->m_GraphState.GetLineWidth(); if (lineWidth != 1.0f) *buf << lineWidth << " w "; + CFX_GraphStateData::LineCap lineCap = pPageObj->m_GraphState.GetLineCap(); + if (lineCap != CFX_GraphStateData::LineCapButt) + *buf << static_cast<int>(lineCap) << " J "; + CFX_GraphStateData::LineJoin lineJoin = pPageObj->m_GraphState.GetLineJoin(); + if (lineJoin != CFX_GraphStateData::LineJoinMiter) + *buf << static_cast<int>(lineJoin) << " j "; GraphicsData graphD; graphD.fillAlpha = pPageObj->m_GeneralState.GetFillAlpha(); diff --git a/core/fxge/ge/cfx_graphstate.cpp b/core/fxge/ge/cfx_graphstate.cpp index 54443b9636..ad6b5fc6c7 100644 --- a/core/fxge/ge/cfx_graphstate.cpp +++ b/core/fxge/ge/cfx_graphstate.cpp @@ -36,14 +36,16 @@ void CFX_GraphState::SetLineWidth(float width) { } CFX_GraphStateData::LineCap CFX_GraphState::GetLineCap() const { - return m_Ref.GetObject()->m_LineCap; + return m_Ref.GetObject() ? m_Ref.GetObject()->m_LineCap + : CFX_GraphStateData::LineCapButt; } void CFX_GraphState::SetLineCap(CFX_GraphStateData::LineCap cap) { m_Ref.GetPrivateCopy()->m_LineCap = cap; } CFX_GraphStateData::LineJoin CFX_GraphState::GetLineJoin() const { - return m_Ref.GetObject()->m_LineJoin; + return m_Ref.GetObject() ? m_Ref.GetObject()->m_LineJoin + : CFX_GraphStateData::LineJoinMiter; } void CFX_GraphState::SetLineJoin(CFX_GraphStateData::LineJoin join) { |