Simplify CFX_PathData::AppendPoint().
Remove the bool closeFigure parameter, which is never set to true except
in 1 place. This makes the majority of AppendPoint() calls simpler. The
one place that needs to close the figure can call AppendPointAndClose()
instead.
Change-Id: Ib9ed1df75578bf68c9151da12b907e4f29bc6364
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/69133
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_path.cpp b/core/fpdfapi/page/cpdf_path.cpp
index a07bb6a..4a3ca3a 100644
--- a/core/fpdfapi/page/cpdf_path.cpp
+++ b/core/fpdfapi/page/cpdf_path.cpp
@@ -57,6 +57,9 @@
FXPT_TYPE type,
bool close) {
CFX_PathData data;
- data.AppendPoint(point, type, close);
+ if (close)
+ data.AppendPointAndClose(point, type);
+ else
+ data.AppendPoint(point, type);
Append(&data, nullptr);
}
diff --git a/core/fpdfapi/render/cpdf_rendershading.cpp b/core/fpdfapi/render/cpdf_rendershading.cpp
index 03adb88..5c20028 100644
--- a/core/fpdfapi/render/cpdf_rendershading.cpp
+++ b/core/fpdfapi/render/cpdf_rendershading.cpp
@@ -786,8 +786,8 @@
patch.bNoPathSmooth = bNoPathSmooth;
for (int i = 0; i < 13; i++) {
- patch.path.AppendPoint(
- CFX_PointF(), i == 0 ? FXPT_TYPE::MoveTo : FXPT_TYPE::BezierTo, false);
+ patch.path.AppendPoint(CFX_PointF(),
+ i == 0 ? FXPT_TYPE::MoveTo : FXPT_TYPE::BezierTo);
}
CFX_PointF coords[16];
diff --git a/core/fxge/cfx_drawutils.cpp b/core/fxge/cfx_drawutils.cpp
index b144153..c95963c 100644
--- a/core/fxge/cfx_drawutils.cpp
+++ b/core/fxge/cfx_drawutils.cpp
@@ -17,16 +17,16 @@
ASSERT(render_device);
CFX_PathData path;
path.AppendPoint(CFX_PointF(view_bounding_box.left, view_bounding_box.top),
- FXPT_TYPE::MoveTo, /*closeFigure=*/false);
+ FXPT_TYPE::MoveTo);
path.AppendPoint(CFX_PointF(view_bounding_box.left, view_bounding_box.bottom),
- FXPT_TYPE::LineTo, /*closeFigure=*/false);
+ FXPT_TYPE::LineTo);
path.AppendPoint(
CFX_PointF(view_bounding_box.right, view_bounding_box.bottom),
- FXPT_TYPE::LineTo, /*closeFigure=*/false);
+ FXPT_TYPE::LineTo);
path.AppendPoint(CFX_PointF(view_bounding_box.right, view_bounding_box.top),
- FXPT_TYPE::LineTo, /*closeFigure=*/false);
+ FXPT_TYPE::LineTo);
path.AppendPoint(CFX_PointF(view_bounding_box.left, view_bounding_box.top),
- FXPT_TYPE::LineTo, /*closeFigure=*/false);
+ FXPT_TYPE::LineTo);
CFX_GraphStateData graph_state_data;
graph_state_data.m_DashArray = {1.0f};
diff --git a/core/fxge/cfx_font.cpp b/core/fxge/cfx_font.cpp
index 9e1d634..49d8bad 100644
--- a/core/fxge/cfx_font.cpp
+++ b/core/fxge/cfx_font.cpp
@@ -111,7 +111,7 @@
param->m_pPath->ClosePath();
param->m_pPath->AppendPoint(
CFX_PointF(to->x / param->m_CoordUnit, to->y / param->m_CoordUnit),
- FXPT_TYPE::MoveTo, false);
+ FXPT_TYPE::MoveTo);
param->m_CurX = to->x;
param->m_CurY = to->y;
@@ -123,7 +123,7 @@
param->m_pPath->AppendPoint(
CFX_PointF(to->x / param->m_CoordUnit, to->y / param->m_CoordUnit),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
param->m_CurX = to->x;
param->m_CurY = to->y;
@@ -138,16 +138,16 @@
param->m_CoordUnit,
(param->m_CurY + (control->y - param->m_CurY) * 2 / 3) /
param->m_CoordUnit),
- FXPT_TYPE::BezierTo, false);
+ FXPT_TYPE::BezierTo);
param->m_pPath->AppendPoint(
CFX_PointF((control->x + (to->x - control->x) / 3) / param->m_CoordUnit,
(control->y + (to->y - control->y) / 3) / param->m_CoordUnit),
- FXPT_TYPE::BezierTo, false);
+ FXPT_TYPE::BezierTo);
param->m_pPath->AppendPoint(
CFX_PointF(to->x / param->m_CoordUnit, to->y / param->m_CoordUnit),
- FXPT_TYPE::BezierTo, false);
+ FXPT_TYPE::BezierTo);
param->m_CurX = to->x;
param->m_CurY = to->y;
@@ -162,15 +162,15 @@
param->m_pPath->AppendPoint(CFX_PointF(control1->x / param->m_CoordUnit,
control1->y / param->m_CoordUnit),
- FXPT_TYPE::BezierTo, false);
+ FXPT_TYPE::BezierTo);
param->m_pPath->AppendPoint(CFX_PointF(control2->x / param->m_CoordUnit,
control2->y / param->m_CoordUnit),
- FXPT_TYPE::BezierTo, false);
+ FXPT_TYPE::BezierTo);
param->m_pPath->AppendPoint(
CFX_PointF(to->x / param->m_CoordUnit, to->y / param->m_CoordUnit),
- FXPT_TYPE::BezierTo, false);
+ FXPT_TYPE::BezierTo);
param->m_CurX = to->x;
param->m_CurY = to->y;
diff --git a/core/fxge/cfx_pathdata.cpp b/core/fxge/cfx_pathdata.cpp
index 342495e..97b8716 100644
--- a/core/fxge/cfx_pathdata.cpp
+++ b/core/fxge/cfx_pathdata.cpp
@@ -217,18 +217,21 @@
m_Points[i].m_Point = pMatrix->Transform(m_Points[i].m_Point);
}
-void CFX_PathData::AppendPoint(const CFX_PointF& point,
- FXPT_TYPE type,
- bool closeFigure) {
- m_Points.push_back(FX_PATHPOINT(point, type, closeFigure));
+void CFX_PathData::AppendPoint(const CFX_PointF& point, FXPT_TYPE type) {
+ m_Points.push_back(FX_PATHPOINT(point, type, /*close=*/false));
+}
+
+void CFX_PathData::AppendPointAndClose(const CFX_PointF& point,
+ FXPT_TYPE type) {
+ m_Points.push_back(FX_PATHPOINT(point, type, /*close=*/true));
}
void CFX_PathData::AppendLine(const CFX_PointF& pt1, const CFX_PointF& pt2) {
if (m_Points.empty() || fabs(m_Points.back().m_Point.x - pt1.x) > 0.001 ||
fabs(m_Points.back().m_Point.y - pt1.y) > 0.001) {
- AppendPoint(pt1, FXPT_TYPE::MoveTo, false);
+ AppendPoint(pt1, FXPT_TYPE::MoveTo);
}
- AppendPoint(pt2, FXPT_TYPE::LineTo, false);
+ AppendPoint(pt2, FXPT_TYPE::LineTo);
}
void CFX_PathData::AppendFloatRect(const CFX_FloatRect& rect) {
@@ -339,8 +342,8 @@
point = CFX_PointF(static_cast<int>(point.x) + 0.5f,
static_cast<int>(point.y) + 0.5f);
}
- NewPath->AppendPoint(
- point, i == 0 ? FXPT_TYPE::MoveTo : FXPT_TYPE::LineTo, false);
+ NewPath->AppendPoint(point,
+ i == 0 ? FXPT_TYPE::MoveTo : FXPT_TYPE::LineTo);
}
if (bAdjust && pMatrix)
*setIdentity = true;
@@ -365,9 +368,8 @@
break;
}
- t_path.AppendPoint(m_Points[mid - i].m_Point, FXPT_TYPE::MoveTo, false);
- t_path.AppendPoint(m_Points[mid - i - 1].m_Point, FXPT_TYPE::LineTo,
- false);
+ t_path.AppendPoint(m_Points[mid - i].m_Point, FXPT_TYPE::MoveTo);
+ t_path.AppendPoint(m_Points[mid - i - 1].m_Point, FXPT_TYPE::LineTo);
}
if (!bZeroArea) {
NewPath->Append(&t_path, nullptr);
@@ -403,8 +405,8 @@
fabs(cur.m_Point.y - next.m_Point.y);
const FX_PATHPOINT& start = use_prev ? prev : cur;
const FX_PATHPOINT& end = use_prev ? m_Points[next_index - 1] : next;
- NewPath->AppendPoint(start.m_Point, FXPT_TYPE::MoveTo, false);
- NewPath->AppendPoint(end.m_Point, FXPT_TYPE::LineTo, false);
+ NewPath->AppendPoint(start.m_Point, FXPT_TYPE::MoveTo);
+ NewPath->AppendPoint(end.m_Point, FXPT_TYPE::LineTo);
continue;
}
@@ -414,8 +416,8 @@
fabs(cur.m_Point.x - next.m_Point.x);
const FX_PATHPOINT& start = use_prev ? prev : cur;
const FX_PATHPOINT& end = use_prev ? m_Points[next_index - 1] : next;
- NewPath->AppendPoint(start.m_Point, FXPT_TYPE::MoveTo, false);
- NewPath->AppendPoint(end.m_Point, FXPT_TYPE::LineTo, false);
+ NewPath->AppendPoint(start.m_Point, FXPT_TYPE::MoveTo);
+ NewPath->AppendPoint(end.m_Point, FXPT_TYPE::LineTo);
continue;
}
}
diff --git a/core/fxge/cfx_pathdata.h b/core/fxge/cfx_pathdata.h
index 9a6695a..9714104 100644
--- a/core/fxge/cfx_pathdata.h
+++ b/core/fxge/cfx_pathdata.h
@@ -66,7 +66,8 @@
void AppendFloatRect(const CFX_FloatRect& rect);
void AppendRect(float left, float bottom, float right, float top);
void AppendLine(const CFX_PointF& pt1, const CFX_PointF& pt2);
- void AppendPoint(const CFX_PointF& point, FXPT_TYPE type, bool closeFigure);
+ void AppendPoint(const CFX_PointF& point, FXPT_TYPE type);
+ void AppendPointAndClose(const CFX_PointF& point, FXPT_TYPE type);
void ClosePath();
private:
diff --git a/core/fxge/cfx_renderdevice.cpp b/core/fxge/cfx_renderdevice.cpp
index 158b071..69f6c56 100644
--- a/core/fxge/cfx_renderdevice.cpp
+++ b/core/fxge/cfx_renderdevice.cpp
@@ -707,8 +707,8 @@
}
CFX_GraphStateData graph_state;
CFX_PathData path;
- path.AppendPoint(ptMoveTo, FXPT_TYPE::MoveTo, false);
- path.AppendPoint(ptLineTo, FXPT_TYPE::LineTo, false);
+ path.AppendPoint(ptMoveTo, FXPT_TYPE::MoveTo);
+ path.AppendPoint(ptLineTo, FXPT_TYPE::LineTo);
return m_pDeviceDriver->DrawPath(&path, nullptr, &graph_state, 0, color,
fill_mode, blend_type);
}
@@ -1102,9 +1102,9 @@
const FX_COLORREF& color) {
ASSERT(!points.empty());
CFX_PathData path;
- path.AppendPoint(points[0], FXPT_TYPE::MoveTo, false);
+ path.AppendPoint(points[0], FXPT_TYPE::MoveTo);
for (size_t i = 1; i < points.size(); ++i)
- path.AppendPoint(points[i], FXPT_TYPE::LineTo, false);
+ path.AppendPoint(points[i], FXPT_TYPE::LineTo);
DrawPath(&path, &mtUser2Device, nullptr, color, 0, FXFILL_ALTERNATE);
}
@@ -1127,8 +1127,8 @@
const FX_COLORREF& color,
float fWidth) {
CFX_PathData path;
- path.AppendPoint(ptMoveTo, FXPT_TYPE::MoveTo, false);
- path.AppendPoint(ptLineTo, FXPT_TYPE::LineTo, false);
+ path.AppendPoint(ptMoveTo, FXPT_TYPE::MoveTo);
+ path.AppendPoint(ptLineTo, FXPT_TYPE::LineTo);
CFX_GraphStateData gsd;
gsd.m_LineWidth = fWidth;
@@ -1221,15 +1221,15 @@
CFX_PathData path;
path.AppendPoint(CFX_PointF(fLeft + fHalfWidth, fBottom + fHalfWidth),
- FXPT_TYPE::MoveTo, false);
+ FXPT_TYPE::MoveTo);
path.AppendPoint(CFX_PointF(fLeft + fHalfWidth, fTop - fHalfWidth),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
path.AppendPoint(CFX_PointF(fRight - fHalfWidth, fTop - fHalfWidth),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
path.AppendPoint(CFX_PointF(fRight - fHalfWidth, fBottom + fHalfWidth),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
path.AppendPoint(CFX_PointF(fLeft + fHalfWidth, fBottom + fHalfWidth),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
DrawPath(&path, pUser2Device, &gsd, 0, color.ToFXColor(nTransparency),
FXFILL_WINDING);
break;
@@ -1242,46 +1242,43 @@
CFX_PathData path_left_top;
path_left_top.AppendPoint(
CFX_PointF(fLeft + fHalfWidth, fBottom + fHalfWidth),
- FXPT_TYPE::MoveTo, false);
+ FXPT_TYPE::MoveTo);
path_left_top.AppendPoint(
- CFX_PointF(fLeft + fHalfWidth, fTop - fHalfWidth), FXPT_TYPE::LineTo,
- false);
+ CFX_PointF(fLeft + fHalfWidth, fTop - fHalfWidth), FXPT_TYPE::LineTo);
path_left_top.AppendPoint(
- CFX_PointF(fRight - fHalfWidth, fTop - fHalfWidth), FXPT_TYPE::LineTo,
- false);
+ CFX_PointF(fRight - fHalfWidth, fTop - fHalfWidth),
+ FXPT_TYPE::LineTo);
path_left_top.AppendPoint(CFX_PointF(fRight - fWidth, fTop - fWidth),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
path_left_top.AppendPoint(CFX_PointF(fLeft + fWidth, fTop - fWidth),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
path_left_top.AppendPoint(CFX_PointF(fLeft + fWidth, fBottom + fWidth),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
path_left_top.AppendPoint(
CFX_PointF(fLeft + fHalfWidth, fBottom + fHalfWidth),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
DrawPath(&path_left_top, pUser2Device, &gsd,
crLeftTop.ToFXColor(nTransparency), 0, FXFILL_ALTERNATE);
CFX_PathData path_right_bottom;
path_right_bottom.AppendPoint(
- CFX_PointF(fRight - fHalfWidth, fTop - fHalfWidth), FXPT_TYPE::MoveTo,
- false);
+ CFX_PointF(fRight - fHalfWidth, fTop - fHalfWidth),
+ FXPT_TYPE::MoveTo);
path_right_bottom.AppendPoint(
CFX_PointF(fRight - fHalfWidth, fBottom + fHalfWidth),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
path_right_bottom.AppendPoint(
CFX_PointF(fLeft + fHalfWidth, fBottom + fHalfWidth),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
path_right_bottom.AppendPoint(
- CFX_PointF(fLeft + fWidth, fBottom + fWidth), FXPT_TYPE::LineTo,
- false);
+ CFX_PointF(fLeft + fWidth, fBottom + fWidth), FXPT_TYPE::LineTo);
path_right_bottom.AppendPoint(
- CFX_PointF(fRight - fWidth, fBottom + fWidth), FXPT_TYPE::LineTo,
- false);
+ CFX_PointF(fRight - fWidth, fBottom + fWidth), FXPT_TYPE::LineTo);
path_right_bottom.AppendPoint(CFX_PointF(fRight - fWidth, fTop - fWidth),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
path_right_bottom.AppendPoint(
- CFX_PointF(fRight - fHalfWidth, fTop - fHalfWidth), FXPT_TYPE::LineTo,
- false);
+ CFX_PointF(fRight - fHalfWidth, fTop - fHalfWidth),
+ FXPT_TYPE::LineTo);
DrawPath(&path_right_bottom, pUser2Device, &gsd,
crRightBottom.ToFXColor(nTransparency), 0, FXFILL_ALTERNATE);
@@ -1299,9 +1296,9 @@
CFX_PathData path;
path.AppendPoint(CFX_PointF(fLeft, fBottom + fHalfWidth),
- FXPT_TYPE::MoveTo, false);
+ FXPT_TYPE::MoveTo);
path.AppendPoint(CFX_PointF(fRight, fBottom + fHalfWidth),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
DrawPath(&path, pUser2Device, &gsd, 0, color.ToFXColor(nTransparency),
FXFILL_ALTERNATE);
break;
diff --git a/fpdfsdk/pwl/cpwl_caret.cpp b/fpdfsdk/pwl/cpwl_caret.cpp
index 739fd37..cc6ae8a 100644
--- a/fpdfsdk/pwl/cpwl_caret.cpp
+++ b/fpdfsdk/pwl/cpwl_caret.cpp
@@ -42,8 +42,8 @@
fCaretBottom = rcRect.bottom;
}
- path.AppendPoint(CFX_PointF(fCaretX, fCaretBottom), FXPT_TYPE::MoveTo, false);
- path.AppendPoint(CFX_PointF(fCaretX, fCaretTop), FXPT_TYPE::LineTo, false);
+ path.AppendPoint(CFX_PointF(fCaretX, fCaretBottom), FXPT_TYPE::MoveTo);
+ path.AppendPoint(CFX_PointF(fCaretX, fCaretTop), FXPT_TYPE::LineTo);
CFX_GraphStateData gsd;
gsd.m_LineWidth = m_fWidth;
diff --git a/fpdfsdk/pwl/cpwl_combo_box.cpp b/fpdfsdk/pwl/cpwl_combo_box.cpp
index b6511ef..a42792a 100644
--- a/fpdfsdk/pwl/cpwl_combo_box.cpp
+++ b/fpdfsdk/pwl/cpwl_combo_box.cpp
@@ -133,10 +133,10 @@
IsFloatBigger(rectWnd.top - rectWnd.bottom,
kComboBoxTriangleHalfLength)) {
CFX_PathData path;
- path.AppendPoint(pt1, FXPT_TYPE::MoveTo, false);
- path.AppendPoint(pt2, FXPT_TYPE::LineTo, false);
- path.AppendPoint(pt3, FXPT_TYPE::LineTo, false);
- path.AppendPoint(pt1, FXPT_TYPE::LineTo, false);
+ path.AppendPoint(pt1, FXPT_TYPE::MoveTo);
+ path.AppendPoint(pt2, FXPT_TYPE::LineTo);
+ path.AppendPoint(pt3, FXPT_TYPE::LineTo);
+ path.AppendPoint(pt1, FXPT_TYPE::LineTo);
pDevice->DrawPath(&path, &mtUser2Device, nullptr,
PWL_DEFAULT_BLACKCOLOR.ToFXColor(GetTransparency()), 0,
diff --git a/fpdfsdk/pwl/cpwl_edit.cpp b/fpdfsdk/pwl/cpwl_edit.cpp
index 8bd1de8..20ebb82 100644
--- a/fpdfsdk/pwl/cpwl_edit.cpp
+++ b/fpdfsdk/pwl/cpwl_edit.cpp
@@ -183,13 +183,13 @@
rcClient.left +
((rcClient.right - rcClient.left) / nCharArray) * (i + 1),
rcClient.bottom),
- FXPT_TYPE::MoveTo, false);
+ FXPT_TYPE::MoveTo);
path.AppendPoint(
CFX_PointF(
rcClient.left +
((rcClient.right - rcClient.left) / nCharArray) * (i + 1),
rcClient.top),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
}
if (!path.GetPoints().empty()) {
pDevice->DrawPath(&path, &mtUser2Device, &gsd, 0,
@@ -211,13 +211,13 @@
rcClient.left +
((rcClient.right - rcClient.left) / nCharArray) * (i + 1),
rcClient.bottom),
- FXPT_TYPE::MoveTo, false);
+ FXPT_TYPE::MoveTo);
path.AppendPoint(
CFX_PointF(
rcClient.left +
((rcClient.right - rcClient.left) / nCharArray) * (i + 1),
rcClient.top),
- FXPT_TYPE::LineTo, false);
+ FXPT_TYPE::LineTo);
}
if (!path.GetPoints().empty()) {
pDevice->DrawPath(&path, &mtUser2Device, &gsd, 0,
diff --git a/fpdfsdk/pwl/cpwl_scroll_bar.cpp b/fpdfsdk/pwl/cpwl_scroll_bar.cpp
index 8fb7f58..28de624 100644
--- a/fpdfsdk/pwl/cpwl_scroll_bar.cpp
+++ b/fpdfsdk/pwl/cpwl_scroll_bar.cpp
@@ -159,10 +159,10 @@
if (rectWnd.right - rectWnd.left > kScrollBarTriangleHalfLength * 2 &&
rectWnd.top - rectWnd.bottom > kScrollBarTriangleHalfLength) {
CFX_PathData path;
- path.AppendPoint(pt1, FXPT_TYPE::MoveTo, false);
- path.AppendPoint(pt2, FXPT_TYPE::LineTo, false);
- path.AppendPoint(pt3, FXPT_TYPE::LineTo, false);
- path.AppendPoint(pt1, FXPT_TYPE::LineTo, false);
+ path.AppendPoint(pt1, FXPT_TYPE::MoveTo);
+ path.AppendPoint(pt2, FXPT_TYPE::LineTo);
+ path.AppendPoint(pt3, FXPT_TYPE::LineTo);
+ path.AppendPoint(pt1, FXPT_TYPE::LineTo);
pDevice->DrawPath(&path, &mtUser2Device, nullptr,
PWL_DEFAULT_BLACKCOLOR.ToFXColor(nTransparency), 0,
diff --git a/xfa/fxgraphics/cxfa_gepath.cpp b/xfa/fxgraphics/cxfa_gepath.cpp
index 6597c80..71e1428 100644
--- a/xfa/fxgraphics/cxfa_gepath.cpp
+++ b/xfa/fxgraphics/cxfa_gepath.cpp
@@ -21,19 +21,19 @@
}
void CXFA_GEPath::MoveTo(const CFX_PointF& point) {
- data_.AppendPoint(point, FXPT_TYPE::MoveTo, false);
+ data_.AppendPoint(point, FXPT_TYPE::MoveTo);
}
void CXFA_GEPath::LineTo(const CFX_PointF& point) {
- data_.AppendPoint(point, FXPT_TYPE::LineTo, false);
+ data_.AppendPoint(point, FXPT_TYPE::LineTo);
}
void CXFA_GEPath::BezierTo(const CFX_PointF& c1,
const CFX_PointF& c2,
const CFX_PointF& to) {
- data_.AppendPoint(c1, FXPT_TYPE::BezierTo, false);
- data_.AppendPoint(c2, FXPT_TYPE::BezierTo, false);
- data_.AppendPoint(to, FXPT_TYPE::BezierTo, false);
+ data_.AppendPoint(c1, FXPT_TYPE::BezierTo);
+ data_.AppendPoint(c2, FXPT_TYPE::BezierTo);
+ data_.AppendPoint(to, FXPT_TYPE::BezierTo);
}
void CXFA_GEPath::ArcTo(const CFX_PointF& pos,
@@ -61,20 +61,20 @@
CFX_PointF bezier;
bezier.x = pos.x + (size.width * ((points[0].x * cs) - (points[0].y * sn)));
bezier.y = pos.y + (size.height * ((points[0].x * sn) + (points[0].y * cs)));
- data_.AppendPoint(bezier, FXPT_TYPE::BezierTo, false);
+ data_.AppendPoint(bezier, FXPT_TYPE::BezierTo);
bezier.x = pos.x + (size.width * ((points[1].x * cs) - (points[1].y * sn)));
bezier.y = pos.y + (size.height * ((points[1].x * sn) + (points[1].y * cs)));
- data_.AppendPoint(bezier, FXPT_TYPE::BezierTo, false);
+ data_.AppendPoint(bezier, FXPT_TYPE::BezierTo);
bezier.x = pos.x + (size.width * cos(start_angle + sweep_angle));
bezier.y = pos.y + (size.height * sin(start_angle + sweep_angle));
- data_.AppendPoint(bezier, FXPT_TYPE::BezierTo, false);
+ data_.AppendPoint(bezier, FXPT_TYPE::BezierTo);
}
void CXFA_GEPath::AddLine(const CFX_PointF& p1, const CFX_PointF& p2) {
- data_.AppendPoint(p1, FXPT_TYPE::MoveTo, false);
- data_.AppendPoint(p2, FXPT_TYPE::LineTo, false);
+ data_.AppendPoint(p1, FXPT_TYPE::MoveTo);
+ data_.AppendPoint(p2, FXPT_TYPE::LineTo);
}
void CXFA_GEPath::AddRectangle(float left,
@@ -109,7 +109,7 @@
CFX_PointF pos(original_pos.x + size.width, original_pos.y + size.height);
data_.AppendPoint(pos + CFX_PointF(size.width * cos(start_angle),
size.height * sin(start_angle)),
- FXPT_TYPE::MoveTo, false);
+ FXPT_TYPE::MoveTo);
float total_sweep = 0;
float local_sweep = 0;
