| Index: core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp
|
| diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp
|
| index 90a508eab3a60599e0cc49afc16acc3df483f80d..81b69bcb24e81008d9d72590893c1299a4287e4f 100644
|
| --- a/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp
|
| +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp
|
| @@ -8,45 +8,41 @@
|
| #include "../../../include/fpdfapi/fpdf_pageobj.h"
|
| #include "../../../include/fpdfapi/fpdf_module.h"
|
| #include "pageint.h"
|
| -void CPDF_PathObject::CopyData(const CPDF_PageObject* pSrc)
|
| -{
|
| - const CPDF_PathObject* pSrcObj = (const CPDF_PathObject*)pSrc;
|
| - m_Path = pSrcObj->m_Path;
|
| - m_FillType = pSrcObj->m_FillType;
|
| - m_bStroke = pSrcObj->m_bStroke;
|
| - m_Matrix = pSrcObj->m_Matrix;
|
| +void CPDF_PathObject::CopyData(const CPDF_PageObject* pSrc) {
|
| + const CPDF_PathObject* pSrcObj = (const CPDF_PathObject*)pSrc;
|
| + m_Path = pSrcObj->m_Path;
|
| + m_FillType = pSrcObj->m_FillType;
|
| + m_bStroke = pSrcObj->m_bStroke;
|
| + m_Matrix = pSrcObj->m_Matrix;
|
| }
|
| -void CPDF_PathObject::Transform(const CPDF_Matrix& matrix)
|
| -{
|
| - m_Matrix.Concat(matrix);
|
| - CalcBoundingBox();
|
| +void CPDF_PathObject::Transform(const CPDF_Matrix& matrix) {
|
| + m_Matrix.Concat(matrix);
|
| + CalcBoundingBox();
|
| }
|
| -void CPDF_PathObject::SetGraphState(CPDF_GraphState GraphState)
|
| -{
|
| - m_GraphState = GraphState;
|
| - CalcBoundingBox();
|
| +void CPDF_PathObject::SetGraphState(CPDF_GraphState GraphState) {
|
| + m_GraphState = GraphState;
|
| + CalcBoundingBox();
|
| }
|
| -void CPDF_PathObject::CalcBoundingBox()
|
| -{
|
| - if (m_Path.IsNull()) {
|
| - return;
|
| - }
|
| - CFX_FloatRect rect;
|
| - FX_FLOAT width = m_GraphState.GetObject()->m_LineWidth;
|
| - if (m_bStroke && width != 0) {
|
| - rect = m_Path.GetBoundingBox(width, m_GraphState.GetObject()->m_MiterLimit);
|
| - } else {
|
| - rect = m_Path.GetBoundingBox();
|
| - }
|
| - rect.Transform(&m_Matrix);
|
| - if (width == 0 && m_bStroke) {
|
| - rect.left += -0.5f;
|
| - rect.right += 0.5f;
|
| - rect.bottom += -0.5f;
|
| - rect.top += 0.5f;
|
| - }
|
| - m_Left = rect.left;
|
| - m_Right = rect.right;
|
| - m_Top = rect.top;
|
| - m_Bottom = rect.bottom;
|
| +void CPDF_PathObject::CalcBoundingBox() {
|
| + if (m_Path.IsNull()) {
|
| + return;
|
| + }
|
| + CFX_FloatRect rect;
|
| + FX_FLOAT width = m_GraphState.GetObject()->m_LineWidth;
|
| + if (m_bStroke && width != 0) {
|
| + rect = m_Path.GetBoundingBox(width, m_GraphState.GetObject()->m_MiterLimit);
|
| + } else {
|
| + rect = m_Path.GetBoundingBox();
|
| + }
|
| + rect.Transform(&m_Matrix);
|
| + if (width == 0 && m_bStroke) {
|
| + rect.left += -0.5f;
|
| + rect.right += 0.5f;
|
| + rect.bottom += -0.5f;
|
| + rect.top += 0.5f;
|
| + }
|
| + m_Left = rect.left;
|
| + m_Right = rect.right;
|
| + m_Top = rect.top;
|
| + m_Bottom = rect.bottom;
|
| }
|
|
|