[PATCH 2/4] gdiplus: Pass line-width parameter to widen-figure functions.
Jeff Smith
whydoubt at gmail.com
Thu Apr 2 15:58:39 CDT 2020
Signed-off-by: Jeff Smith <whydoubt at gmail.com>
---
I re-ordered the parameter ordering for some functions, to consistently
group (input) path parameters before pen parameters.
dlls/gdiplus/graphicspath.c | 82 ++++++++++++++++++-------------------
1 file changed, 41 insertions(+), 41 deletions(-)
diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index af0d6500f8..9e819242b8 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -1804,12 +1804,12 @@ GpStatus WINGDIPAPI GdipWarpPath(GpPath *path, GpMatrix* matrix,
}
static void add_bevel_point(const GpPointF *endpoint, const GpPointF *nextpoint,
- GpPen *pen, int right_side, path_list_node_t **last_point)
+ REAL pen_width, int right_side, path_list_node_t **last_point)
{
REAL segment_dy = nextpoint->Y-endpoint->Y;
REAL segment_dx = nextpoint->X-endpoint->X;
REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx);
- REAL distance = pen->width/2.0;
+ REAL distance = pen_width / 2.0;
REAL bevel_dx, bevel_dy;
if (segment_length == 0.0)
@@ -1835,7 +1835,7 @@ static void add_bevel_point(const GpPointF *endpoint, const GpPointF *nextpoint,
}
static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF *p3,
- GpPen* pen, path_list_node_t **last_point)
+ GpPen* pen, REAL pen_width, path_list_node_t **last_point)
{
switch (pen->join)
{
@@ -1843,7 +1843,7 @@ static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF *
case LineJoinMiterClipped:
if ((p2->X - p1->X) * (p3->Y - p1->Y) > (p2->Y - p1->Y) * (p3->X - p1->X))
{
- float distance = pen->width/2.0;
+ float distance = pen_width / 2.0;
float length_0 = sqrtf((p2->X-p1->X)*(p2->X-p1->X)+(p2->Y-p1->Y)*(p2->Y-p1->Y));
float length_1 = sqrtf((p3->X-p2->X)*(p3->X-p2->X)+(p3->Y-p2->Y)*(p3->Y-p2->Y));
float dx0 = distance * (p2->X - p1->X) / length_0;
@@ -1870,14 +1870,14 @@ static void widen_joint(const GpPointF *p1, const GpPointF *p2, const GpPointF *
/* else fall-through */
default:
case LineJoinBevel:
- add_bevel_point(p2, p1, pen, 1, last_point);
- add_bevel_point(p2, p3, pen, 0, last_point);
+ add_bevel_point(p2, p1, pen_width, 1, last_point);
+ add_bevel_point(p2, p3, pen_width, 0, last_point);
break;
}
}
static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint,
- GpPen *pen, GpLineCap cap, GpCustomLineCap *custom, int add_first_points,
+ REAL pen_width, GpLineCap cap, GpCustomLineCap *custom, int add_first_points,
int add_last_point, path_list_node_t **last_point)
{
switch (cap)
@@ -1885,16 +1885,16 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint,
default:
case LineCapFlat:
if (add_first_points)
- add_bevel_point(endpoint, nextpoint, pen, 1, last_point);
+ add_bevel_point(endpoint, nextpoint, pen_width, 1, last_point);
if (add_last_point)
- add_bevel_point(endpoint, nextpoint, pen, 0, last_point);
+ add_bevel_point(endpoint, nextpoint, pen_width, 0, last_point);
break;
case LineCapSquare:
{
REAL segment_dy = nextpoint->Y-endpoint->Y;
REAL segment_dx = nextpoint->X-endpoint->X;
REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx);
- REAL distance = pen->width/2.0;
+ REAL distance = pen_width / 2.0;
REAL bevel_dx, bevel_dy;
REAL extend_dx, extend_dy;
@@ -1919,7 +1919,7 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint,
REAL segment_dy = nextpoint->Y-endpoint->Y;
REAL segment_dx = nextpoint->X-endpoint->X;
REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx);
- REAL distance = pen->width/2.0;
+ REAL distance = pen_width / 2.0;
REAL dx, dy, dx2, dy2;
const REAL control_point_distance = 0.5522847498307935; /* 4/3 * (sqrt(2) - 1) */
@@ -1956,7 +1956,7 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint,
endpoint->Y + dx, PathPointTypeBezier);
}
else if (add_last_point)
- add_bevel_point(endpoint, nextpoint, pen, 0, last_point);
+ add_bevel_point(endpoint, nextpoint, pen_width, 0, last_point);
break;
}
case LineCapTriangle:
@@ -1964,20 +1964,20 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint,
REAL segment_dy = nextpoint->Y-endpoint->Y;
REAL segment_dx = nextpoint->X-endpoint->X;
REAL segment_length = sqrtf(segment_dy*segment_dy + segment_dx*segment_dx);
- REAL distance = pen->width/2.0;
+ REAL distance = pen_width / 2.0;
REAL dx, dy;
dx = distance * segment_dx / segment_length;
dy = distance * segment_dy / segment_length;
if (add_first_points) {
- add_bevel_point(endpoint, nextpoint, pen, 1, last_point);
+ add_bevel_point(endpoint, nextpoint, pen_width, 1, last_point);
*last_point = add_path_list_node(*last_point, endpoint->X - dx,
endpoint->Y - dy, PathPointTypeLine);
}
if (add_first_points || add_last_point)
- add_bevel_point(endpoint, nextpoint, pen, 0, last_point);
+ add_bevel_point(endpoint, nextpoint, pen_width, 0, last_point);
break;
}
}
@@ -2097,9 +2097,9 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint,
(*last_point)->type |= PathPointTypeCloseSubpath;
}
-static void widen_open_figure(const GpPointF *points, GpPen *pen, int start, int end,
- GpLineCap start_cap, GpCustomLineCap *start_custom, GpLineCap end_cap,
- GpCustomLineCap *end_custom, path_list_node_t **last_point)
+static void widen_open_figure(const GpPointF *points, int start, int end,
+ GpPen *pen, REAL pen_width, GpLineCap start_cap, GpCustomLineCap *start_custom,
+ GpLineCap end_cap, GpCustomLineCap *end_custom, path_list_node_t **last_point)
{
int i;
path_list_node_t *prev_point;
@@ -2110,28 +2110,28 @@ static void widen_open_figure(const GpPointF *points, GpPen *pen, int start, int
prev_point = *last_point;
widen_cap(&points[start], &points[start+1],
- pen, start_cap, start_custom, FALSE, TRUE, last_point);
+ pen_width, start_cap, start_custom, FALSE, TRUE, last_point);
for (i=start+1; i<end; i++)
- widen_joint(&points[i-1], &points[i],
- &points[i+1], pen, last_point);
+ widen_joint(&points[i-1], &points[i], &points[i+1],
+ pen, pen_width, last_point);
widen_cap(&points[end], &points[end-1],
- pen, end_cap, end_custom, TRUE, TRUE, last_point);
+ pen_width, end_cap, end_custom, TRUE, TRUE, last_point);
for (i=end-1; i>start; i--)
- widen_joint(&points[i+1], &points[i],
- &points[i-1], pen, last_point);
+ widen_joint(&points[i+1], &points[i], &points[i-1],
+ pen, pen_width, last_point);
widen_cap(&points[start], &points[start+1],
- pen, start_cap, start_custom, TRUE, FALSE, last_point);
+ pen_width, start_cap, start_custom, TRUE, FALSE, last_point);
prev_point->next->type = PathPointTypeStart;
(*last_point)->type |= PathPointTypeCloseSubpath;
}
-static void widen_closed_figure(GpPath *path, GpPen *pen, int start, int end,
- path_list_node_t **last_point)
+static void widen_closed_figure(GpPath *path, int start, int end,
+ GpPen *pen, REAL pen_width, path_list_node_t **last_point)
{
int i;
path_list_node_t *prev_point;
@@ -2143,14 +2143,14 @@ static void widen_closed_figure(GpPath *path, GpPen *pen, int start, int end,
prev_point = *last_point;
widen_joint(&path->pathdata.Points[end], &path->pathdata.Points[start],
- &path->pathdata.Points[start+1], pen, last_point);
+ &path->pathdata.Points[start+1], pen, pen_width, last_point);
for (i=start+1; i<end; i++)
widen_joint(&path->pathdata.Points[i-1], &path->pathdata.Points[i],
- &path->pathdata.Points[i+1], pen, last_point);
+ &path->pathdata.Points[i+1], pen, pen_width, last_point);
widen_joint(&path->pathdata.Points[end-1], &path->pathdata.Points[end],
- &path->pathdata.Points[start], pen, last_point);
+ &path->pathdata.Points[start], pen, pen_width, last_point);
prev_point->next->type = PathPointTypeStart;
(*last_point)->type |= PathPointTypeCloseSubpath;
@@ -2159,21 +2159,21 @@ static void widen_closed_figure(GpPath *path, GpPen *pen, int start, int end,
prev_point = *last_point;
widen_joint(&path->pathdata.Points[start], &path->pathdata.Points[end],
- &path->pathdata.Points[end-1], pen, last_point);
+ &path->pathdata.Points[end-1], pen, pen_width, last_point);
for (i=end-1; i>start; i--)
widen_joint(&path->pathdata.Points[i+1], &path->pathdata.Points[i],
- &path->pathdata.Points[i-1], pen, last_point);
+ &path->pathdata.Points[i-1], pen, pen_width, last_point);
widen_joint(&path->pathdata.Points[start+1], &path->pathdata.Points[start],
- &path->pathdata.Points[end], pen, last_point);
+ &path->pathdata.Points[end], pen, pen_width, last_point);
prev_point->next->type = PathPointTypeStart;
(*last_point)->type |= PathPointTypeCloseSubpath;
}
-static void widen_dashed_figure(GpPath *path, GpPen *pen, int start, int end,
- int closed, path_list_node_t **last_point)
+static void widen_dashed_figure(GpPath *path, int start, int end, int closed,
+ GpPen *pen, REAL pen_width, path_list_node_t **last_point)
{
int i, j;
REAL dash_pos=0.0;
@@ -2267,7 +2267,7 @@ static void widen_dashed_figure(GpPath *path, GpPen *pen, int start, int end,
tmp_points[num_tmp_points].X = path->pathdata.Points[i].X + segment_dx * segment_pos / segment_length;
tmp_points[num_tmp_points].Y = path->pathdata.Points[i].Y + segment_dy * segment_pos / segment_length;
- widen_open_figure(tmp_points, pen, 0, num_tmp_points,
+ widen_open_figure(tmp_points, 0, num_tmp_points, pen, pen_width,
draw_start_cap ? pen->startcap : LineCapFlat, pen->customstart,
LineCapFlat, NULL, last_point);
draw_start_cap = 0;
@@ -2301,7 +2301,7 @@ static void widen_dashed_figure(GpPath *path, GpPen *pen, int start, int end,
if (dash_index % 2 == 0 && num_tmp_points != 0)
{
/* last dash overflows last segment */
- widen_open_figure(tmp_points, pen, 0, num_tmp_points-1,
+ widen_open_figure(tmp_points, 0, num_tmp_points-1, pen, pen_width,
draw_start_cap ? pen->startcap : LineCapFlat, pen->customstart,
closed ? LineCapFlat : pen->endcap, pen->customend, last_point);
}
@@ -2364,17 +2364,17 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix,
if ((types[i]&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath)
{
if (pen->dash != DashStyleSolid)
- widen_dashed_figure(flat_path, pen, subpath_start, i, 1, &last_point);
+ widen_dashed_figure(flat_path, subpath_start, i, 1, pen, pen->width, &last_point);
else
- widen_closed_figure(flat_path, pen, subpath_start, i, &last_point);
+ widen_closed_figure(flat_path, subpath_start, i, pen, pen->width, &last_point);
}
else if (i == flat_path->pathdata.Count-1 ||
(types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart)
{
if (pen->dash != DashStyleSolid)
- widen_dashed_figure(flat_path, pen, subpath_start, i, 0, &last_point);
+ widen_dashed_figure(flat_path, subpath_start, i, 0, pen, pen->width, &last_point);
else
- widen_open_figure(flat_path->pathdata.Points, pen, subpath_start, i, pen->startcap, pen->customstart, pen->endcap, pen->customend, &last_point);
+ widen_open_figure(flat_path->pathdata.Points, subpath_start, i, pen, pen->width, pen->startcap, pen->customstart, pen->endcap, pen->customend, &last_point);
}
}
--
2.23.0
More information about the wine-devel
mailing list