summaryrefslogtreecommitdiff
path: root/xfa
diff options
context:
space:
mode:
Diffstat (limited to 'xfa')
-rw-r--r--xfa/fde/cfde_path.cpp19
-rw-r--r--xfa/fxgraphics/cfx_path_generator.cpp53
2 files changed, 44 insertions, 28 deletions
diff --git a/xfa/fde/cfde_path.cpp b/xfa/fde/cfde_path.cpp
index 6db0ccc6bf..cd65d9ee09 100644
--- a/xfa/fde/cfde_path.cpp
+++ b/xfa/fde/cfde_path.cpp
@@ -16,7 +16,7 @@ bool CFDE_Path::StartFigure() {
bool CFDE_Path::CloseFigure() {
FX_PATHPOINT* pPoint = GetLastPoint();
if (pPoint)
- pPoint->m_Flag |= FXPT_CLOSEFIGURE;
+ pPoint->m_CloseFigure = true;
return true;
}
@@ -32,7 +32,7 @@ FX_PATHPOINT* CFDE_Path::GetLastPoint(int32_t iCount) const {
bool CFDE_Path::FigureClosed() const {
FX_PATHPOINT* pPoint = GetLastPoint();
- return pPoint ? (pPoint->m_Flag & FXPT_CLOSEFIGURE) : true;
+ return pPoint ? pPoint->m_CloseFigure : true;
}
FX_PATHPOINT* CFDE_Path::AddPoints(int32_t iCount) {
@@ -48,14 +48,16 @@ void CFDE_Path::MoveTo(FX_FLOAT fx, FX_FLOAT fy) {
FX_PATHPOINT* pPoint = AddPoints(1);
pPoint->m_PointX = fx;
pPoint->m_PointY = fy;
- pPoint->m_Flag = FXPT_MOVETO;
+ pPoint->m_Type = FXPT_TYPE::MoveTo;
+ pPoint->m_CloseFigure = false;
}
void CFDE_Path::LineTo(FX_FLOAT fx, FX_FLOAT fy) {
FX_PATHPOINT* pPoint = AddPoints(1);
pPoint->m_PointX = fx;
pPoint->m_PointY = fy;
- pPoint->m_Flag = FXPT_LINETO;
+ pPoint->m_Type = FXPT_TYPE::LineTo;
+ pPoint->m_CloseFigure = false;
}
void CFDE_Path::BezierTo(const CFX_PointF& p1,
@@ -64,13 +66,16 @@ void CFDE_Path::BezierTo(const CFX_PointF& p1,
FX_PATHPOINT* p = AddPoints(3);
p[0].m_PointX = p1.x;
p[0].m_PointY = p1.y;
- p[0].m_Flag = FXPT_BEZIERTO;
+ p[0].m_Type = FXPT_TYPE::BezierTo;
+ p[0].m_CloseFigure = false;
p[1].m_PointX = p2.x;
p[1].m_PointY = p2.y;
- p[1].m_Flag = FXPT_BEZIERTO;
+ p[1].m_Type = FXPT_TYPE::BezierTo;
+ p[1].m_CloseFigure = false;
p[2].m_PointX = p3.x;
p[2].m_PointY = p3.y;
- p[2].m_Flag = FXPT_BEZIERTO;
+ p[2].m_Type = FXPT_TYPE::BezierTo;
+ p[2].m_CloseFigure = false;
}
void CFDE_Path::ArcTo(bool bStart,
diff --git a/xfa/fxgraphics/cfx_path_generator.cpp b/xfa/fxgraphics/cfx_path_generator.cpp
index 0122b1ce4d..c7f4c0b756 100644
--- a/xfa/fxgraphics/cfx_path_generator.cpp
+++ b/xfa/fxgraphics/cfx_path_generator.cpp
@@ -33,12 +33,14 @@ void CFX_PathGenerator::AddPathData(FX_PATHPOINT* pPoints, int nCount) {
void CFX_PathGenerator::MoveTo(FX_FLOAT x, FX_FLOAT y) {
m_pPathData->AddPointCount(1);
- m_pPathData->SetPoint(m_pPathData->GetPointCount() - 1, x, y, FXPT_MOVETO);
+ m_pPathData->SetPoint(m_pPathData->GetPointCount() - 1, x, y,
+ FXPT_TYPE::MoveTo, false);
}
void CFX_PathGenerator::LineTo(FX_FLOAT x, FX_FLOAT y) {
m_pPathData->AddPointCount(1);
- m_pPathData->SetPoint(m_pPathData->GetPointCount() - 1, x, y, FXPT_LINETO);
+ m_pPathData->SetPoint(m_pPathData->GetPointCount() - 1, x, y,
+ FXPT_TYPE::LineTo, false);
}
void CFX_PathGenerator::BezierTo(FX_FLOAT ctrl_x1,
@@ -49,16 +51,18 @@ void CFX_PathGenerator::BezierTo(FX_FLOAT ctrl_x1,
FX_FLOAT to_y) {
int old_count = m_pPathData->GetPointCount();
m_pPathData->AddPointCount(3);
- m_pPathData->SetPoint(old_count, ctrl_x1, ctrl_y1, FXPT_BEZIERTO);
- m_pPathData->SetPoint(old_count + 1, ctrl_x2, ctrl_y2, FXPT_BEZIERTO);
- m_pPathData->SetPoint(old_count + 2, to_x, to_y, FXPT_BEZIERTO);
+ m_pPathData->SetPoint(old_count, ctrl_x1, ctrl_y1, FXPT_TYPE::BezierTo,
+ false);
+ m_pPathData->SetPoint(old_count + 1, ctrl_x2, ctrl_y2, FXPT_TYPE::BezierTo,
+ false);
+ m_pPathData->SetPoint(old_count + 2, to_x, to_y, FXPT_TYPE::BezierTo, false);
}
void CFX_PathGenerator::Close() {
if (m_pPathData->GetPointCount() > 0) {
int index = m_pPathData->GetPointCount() - 1;
FX_PATHPOINT* pPoints = m_pPathData->GetPoints();
- pPoints[index].m_Flag |= FXPT_CLOSEFIGURE;
+ pPoints[index].m_CloseFigure = true;
}
}
@@ -68,8 +72,8 @@ void CFX_PathGenerator::AddLine(FX_FLOAT x1,
FX_FLOAT y2) {
int old_count = m_pPathData->GetPointCount();
m_pPathData->AddPointCount(2);
- m_pPathData->SetPoint(old_count, x1, y1, FXPT_MOVETO);
- m_pPathData->SetPoint(old_count + 1, x2, y2, FXPT_LINETO);
+ m_pPathData->SetPoint(old_count, x1, y1, FXPT_TYPE::MoveTo, false);
+ m_pPathData->SetPoint(old_count + 1, x2, y2, FXPT_TYPE::LineTo, false);
}
void CFX_PathGenerator::AddBezier(FX_FLOAT start_x,
@@ -82,10 +86,13 @@ void CFX_PathGenerator::AddBezier(FX_FLOAT start_x,
FX_FLOAT end_y) {
int old_count = m_pPathData->GetPointCount();
m_pPathData->AddPointCount(4);
- m_pPathData->SetPoint(old_count, start_x, start_y, FXPT_MOVETO);
- m_pPathData->SetPoint(old_count + 1, ctrl_x1, ctrl_y1, FXPT_BEZIERTO);
- m_pPathData->SetPoint(old_count + 2, ctrl_x2, ctrl_y2, FXPT_BEZIERTO);
- m_pPathData->SetPoint(old_count + 3, end_x, end_y, FXPT_BEZIERTO);
+ m_pPathData->SetPoint(old_count, start_x, start_y, FXPT_TYPE::MoveTo, false);
+ m_pPathData->SetPoint(old_count + 1, ctrl_x1, ctrl_y1, FXPT_TYPE::BezierTo,
+ false);
+ m_pPathData->SetPoint(old_count + 2, ctrl_x2, ctrl_y2, FXPT_TYPE::BezierTo,
+ false);
+ m_pPathData->SetPoint(old_count + 3, end_x, end_y, FXPT_TYPE::BezierTo,
+ false);
}
void CFX_PathGenerator::AddRectangle(FX_FLOAT x1,
@@ -124,13 +131,16 @@ void CFX_PathGenerator::ArcTo(FX_FLOAT x,
FX_FLOAT bezier_x, bezier_y;
bezier_x = x + (width * ((px[0] * cs) - (py[0] * sn)));
bezier_y = y + (height * ((px[0] * sn) + (py[0] * cs)));
- m_pPathData->SetPoint(old_count, bezier_x, bezier_y, FXPT_BEZIERTO);
+ m_pPathData->SetPoint(old_count, bezier_x, bezier_y, FXPT_TYPE::BezierTo,
+ false);
bezier_x = x + (width * ((px[1] * cs) - (py[1] * sn)));
bezier_y = y + (height * ((px[1] * sn) + (py[1] * cs)));
- m_pPathData->SetPoint(old_count + 1, bezier_x, bezier_y, FXPT_BEZIERTO);
+ m_pPathData->SetPoint(old_count + 1, bezier_x, bezier_y, FXPT_TYPE::BezierTo,
+ false);
bezier_x = x + (width * FXSYS_cos(start_angle + sweep_angle));
bezier_y = y + (height * FXSYS_sin(start_angle + sweep_angle));
- m_pPathData->SetPoint(old_count + 2, bezier_x, bezier_y, FXPT_BEZIERTO);
+ m_pPathData->SetPoint(old_count + 2, bezier_x, bezier_y, FXPT_TYPE::BezierTo,
+ false);
}
void CFX_PathGenerator::AddArc(FX_FLOAT x,
@@ -157,9 +167,9 @@ void CFX_PathGenerator::AddArc(FX_FLOAT x,
sweep_angle = -FX_PI * 2;
}
m_pPathData->AddPointCount(1);
- m_pPathData->SetPoint(m_pPathData->GetPointCount() - 1,
- x + (width * FXSYS_cos(start_angle)),
- y + (height * FXSYS_sin(start_angle)), FXPT_MOVETO);
+ m_pPathData->SetPoint(
+ m_pPathData->GetPointCount() - 1, x + (width * FXSYS_cos(start_angle)),
+ y + (height * FXSYS_sin(start_angle)), FXPT_TYPE::MoveTo, false);
FX_FLOAT total_sweep = 0, local_sweep = 0, prev_sweep = 0;
bool done = false;
do {
@@ -194,13 +204,14 @@ void CFX_PathGenerator::AddPie(FX_FLOAT x,
if (sweep_angle == 0) {
int old_count = m_pPathData->GetPointCount();
m_pPathData->AddPointCount(2);
- m_pPathData->SetPoint(old_count, x, y, FXPT_MOVETO);
+ m_pPathData->SetPoint(old_count, x, y, FXPT_TYPE::MoveTo, false);
m_pPathData->SetPoint(old_count + 1, x + (width * FXSYS_cos(start_angle)),
- y + (height * FXSYS_sin(start_angle)), FXPT_LINETO);
+ y + (height * FXSYS_sin(start_angle)),
+ FXPT_TYPE::LineTo, false);
return;
}
AddArc(x, y, width, height, start_angle, sweep_angle);
m_pPathData->AddPointCount(1);
m_pPathData->SetPoint(m_pPathData->GetPointCount() - 1, x, y,
- FXPT_LINETO | FXPT_CLOSEFIGURE);
+ FXPT_TYPE::LineTo, true);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 15:01:14 +0000