From 7ccfae2943312052d8ee3b881819f26e0b59b79c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 29 Jun 2023 21:45:59 -0400 Subject: [PATCH] Replace GSK_PATH_CURVE by _CUBIC --- demos/gtk-demo/path_fill.c | 2 +- demos/gtk-demo/path_text.c | 2 +- gsk/gskcontour.c | 4 ++-- gsk/gskcurve.c | 4 ++-- gsk/gskenums.h | 7 +------ gsk/gskpath.c | 6 +++--- gsk/gskpathbuilder.c | 2 +- gsk/gskpathdash.c | 2 +- gsk/gskpathopprivate.h | 6 +++--- testsuite/gsk/curve-special-cases.c | 2 +- testsuite/gsk/curve.c | 4 ++-- testsuite/gsk/dash.c | 2 +- testsuite/gsk/path.c | 6 +++--- 13 files changed, 22 insertions(+), 27 deletions(-) diff --git a/demos/gtk-demo/path_fill.c b/demos/gtk-demo/path_fill.c index 88ea1d40ca..dc04d34613 100644 --- a/demos/gtk-demo/path_fill.c +++ b/demos/gtk-demo/path_fill.c @@ -246,7 +246,7 @@ build_path (GskPathOperation op, gsk_path_builder_line_to (builder, pts[1].x, pts[1].y); break; - case GSK_PATH_CURVE: + case GSK_PATH_CUBIC: gsk_path_builder_curve_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y); break; diff --git a/demos/gtk-demo/path_text.c b/demos/gtk-demo/path_text.c index 02990c5b67..5f3c53053d 100644 --- a/demos/gtk-demo/path_text.c +++ b/demos/gtk-demo/path_text.c @@ -122,7 +122,7 @@ gtk_path_transform_op (GskPathOperation op, } break; - case GSK_PATH_CURVE: + case GSK_PATH_CUBIC: { graphene_point_t res[3]; gtk_path_transform_point (transform->measure, &pts[1], &transform->offset, transform->scale, &res[0]); diff --git a/gsk/gskcontour.c b/gsk/gskcontour.c index ecd1556427..90ce3522d3 100644 --- a/gsk/gskcontour.c +++ b/gsk/gskcontour.c @@ -619,7 +619,7 @@ gsk_circle_contour_curve (const graphene_point_t curve[4], { ForeachWrapper *wrapper = data; - return wrapper->func (GSK_PATH_CURVE, curve, 4, 0, wrapper->user_data); + return wrapper->func (GSK_PATH_CUBIC, curve, 4, 0, wrapper->user_data); } static gboolean @@ -982,7 +982,7 @@ gsk_standard_contour_print (const GskContour *contour, _g_string_append_point (string, &pt[1]); break; - case GSK_PATH_CURVE: + case GSK_PATH_CUBIC: g_string_append (string, " C "); _g_string_append_point (string, &pt[1]); g_string_append (string, ", "); diff --git a/gsk/gskcurve.c b/gsk/gskcurve.c index b10279ee40..16293a8ec2 100644 --- a/gsk/gskcurve.c +++ b/gsk/gskcurve.c @@ -224,7 +224,7 @@ static void gsk_curve_curve_init_from_points (GskCurveCurve *self, const graphene_point_t pts[4]) { - self->op = GSK_PATH_CURVE; + self->op = GSK_PATH_CUBIC; self->has_coefficients = FALSE; memcpy (self->points, pts, sizeof (graphene_point_t) * 4); } @@ -870,7 +870,7 @@ get_class (GskPathOperation op) const GskCurveClass *klasses[] = { [GSK_PATH_CLOSE] = &GSK_LINE_CURVE_CLASS, [GSK_PATH_LINE] = &GSK_LINE_CURVE_CLASS, - [GSK_PATH_CURVE] = &GSK_CURVE_CURVE_CLASS, + [GSK_PATH_CUBIC] = &GSK_CURVE_CURVE_CLASS, [GSK_PATH_CONIC] = &GSK_CONIC_CURVE_CLASS, }; diff --git a/gsk/gskenums.h b/gsk/gskenums.h index 967dd426e0..afeee1fbc5 100644 --- a/gsk/gskenums.h +++ b/gsk/gskenums.h @@ -260,11 +260,6 @@ typedef enum { * @GSK_PATH_CUBIC: A curve-to operation describing a cubic Bézier curve * with 4 points describing the start point, the two control points * and the end point of the curve. - * a line back to the starting point. Two points describe the start - * and end of the line. - * @GSK_PATH_CURVE: A curve-to operation describing a cubic Bézier curve - * with 4 points describing the start point, the two control points - * and the end point of the curve. * @GSK_PATH_CONIC: A weighted quadratic Bézier curve with 3 points * describing the start point, control point and end point of the * curve. A weight for the curve will be passed, too. @@ -277,7 +272,7 @@ typedef enum { GSK_PATH_MOVE, GSK_PATH_CLOSE, GSK_PATH_LINE, - GSK_PATH_CURVE, + GSK_PATH_CUBIC, GSK_PATH_CONIC, } GskPathOperation; diff --git a/gsk/gskpath.c b/gsk/gskpath.c index d2853277dd..437e6b7e92 100644 --- a/gsk/gskpath.c +++ b/gsk/gskpath.c @@ -229,7 +229,7 @@ gsk_path_to_cairo_add_op (GskPathOperation op, cairo_line_to (cr, pts[1].x, pts[1].y); break; - case GSK_PATH_CURVE: + case GSK_PATH_CUBIC: cairo_curve_to (cr, pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y); break; @@ -426,14 +426,14 @@ gsk_path_foreach_trampoline (GskPathOperation op, case GSK_PATH_LINE: return trampoline->func (op, pts, n_pts, weight, trampoline->user_data); - case GSK_PATH_CURVE: + case GSK_PATH_CUBIC: { GskCurve curve; if (trampoline->flags & GSK_PATH_FOREACH_ALLOW_CURVE) return trampoline->func (op, pts, n_pts, weight, trampoline->user_data); - gsk_curve_init (&curve, gsk_pathop_encode (GSK_PATH_CURVE, pts)); + gsk_curve_init (&curve, gsk_pathop_encode (GSK_PATH_CUBIC, pts)); return gsk_curve_decompose (&curve, trampoline->tolerance, gsk_path_foreach_trampoline_add_line, diff --git a/gsk/gskpathbuilder.c b/gsk/gskpathbuilder.c index da7a343dfe..4b7be68712 100644 --- a/gsk/gskpathbuilder.c +++ b/gsk/gskpathbuilder.c @@ -681,7 +681,7 @@ gsk_path_builder_curve_to (GskPathBuilder *self, self->flags &= ~GSK_PATH_FLAT; gsk_path_builder_append_current (self, - GSK_PATH_CURVE, + GSK_PATH_CUBIC, 3, (graphene_point_t[3]) { GRAPHENE_POINT_INIT (x1, y1), GRAPHENE_POINT_INIT (x2, y2), diff --git a/gsk/gskpathdash.c b/gsk/gskpathdash.c index 311ad66cc6..b4819f9360 100644 --- a/gsk/gskpathdash.c +++ b/gsk/gskpathdash.c @@ -215,7 +215,7 @@ gsk_path_dash_foreach (GskPathOperation op, G_GNUC_FALLTHROUGH; case GSK_PATH_LINE: - case GSK_PATH_CURVE: + case GSK_PATH_CUBIC: case GSK_PATH_CONIC: gsk_curve_init_foreach (&self->curve, op, pts, n_pts, weight); if (!gsk_curve_decompose (&self->curve, self->tolerance, gsk_path_dash_add_line_segment, self)) diff --git a/gsk/gskpathopprivate.h b/gsk/gskpathopprivate.h index da1c3e63e4..6496a43c29 100644 --- a/gsk/gskpathopprivate.h +++ b/gsk/gskpathopprivate.h @@ -89,7 +89,7 @@ gsk_pathop_foreach (gskpathop pop, case GSK_PATH_LINE: return func (gsk_pathop_op (pop), gsk_pathop_points (pop), 2, 0, user_data); - case GSK_PATH_CURVE: + case GSK_PATH_CUBIC: return func (gsk_pathop_op (pop), gsk_pathop_points (pop), 4, 0, user_data); case GSK_PATH_CONIC: @@ -124,7 +124,7 @@ gsk_path_builder_pathop_to (GskPathBuilder *builder, gsk_path_builder_line_to (builder, pts[1].x, pts[1].y); break; - case GSK_PATH_CURVE: + case GSK_PATH_CUBIC: gsk_path_builder_curve_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y); break; @@ -158,7 +158,7 @@ gsk_path_builder_pathop_reverse_to (GskPathBuilder *builder, gsk_path_builder_line_to (builder, pts[1].x, pts[1].y); break; - case GSK_PATH_CURVE: + case GSK_PATH_CUBIC: gsk_path_builder_curve_to (builder, pts[2].x, pts[2].y, pts[1].x, pts[1].y, pts[0].x, pts[0].y); break; diff --git a/testsuite/gsk/curve-special-cases.c b/testsuite/gsk/curve-special-cases.c index 4864bb3e84..02bb84d53d 100644 --- a/testsuite/gsk/curve-special-cases.c +++ b/testsuite/gsk/curve-special-cases.c @@ -113,7 +113,7 @@ test_curve_tangents (void) graphene_point_init (&p[1], 50, 0); graphene_point_init (&p[2], 100, 50); graphene_point_init (&p[3], 100, 100); - gsk_curve_init (&c, gsk_pathop_encode (GSK_PATH_CURVE, p)); + gsk_curve_init (&c, gsk_pathop_encode (GSK_PATH_CUBIC, p)); gsk_curve_get_start_tangent (&c, &t); g_assert_true (graphene_vec2_near (&t, graphene_vec2_x_axis (), 0.0001)); diff --git a/testsuite/gsk/curve.c b/testsuite/gsk/curve.c index b33b51d6bf..03b9b956c7 100644 --- a/testsuite/gsk/curve.c +++ b/testsuite/gsk/curve.c @@ -32,7 +32,7 @@ init_random_curve (GskCurve *curve) } break; - case GSK_PATH_CURVE: + case GSK_PATH_CUBIC: { graphene_point_t p[4]; @@ -40,7 +40,7 @@ init_random_curve (GskCurve *curve) init_random_point (&p[1]); init_random_point (&p[2]); init_random_point (&p[3]); - gsk_curve_init (curve, gsk_pathop_encode (GSK_PATH_CURVE, p)); + gsk_curve_init (curve, gsk_pathop_encode (GSK_PATH_CUBIC, p)); } break; diff --git a/testsuite/gsk/dash.c b/testsuite/gsk/dash.c index 93655f20fc..07508832d1 100644 --- a/testsuite/gsk/dash.c +++ b/testsuite/gsk/dash.c @@ -44,7 +44,7 @@ build_path (GskPathOperation op, gsk_path_builder_line_to (builder, pts[1].x, pts[1].y); break; - case GSK_PATH_CURVE: + case GSK_PATH_CUBIC: gsk_path_builder_curve_to (builder, pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y); break; diff --git a/testsuite/gsk/path.c b/testsuite/gsk/path.c index 042c18775c..5d9c96dcd0 100644 --- a/testsuite/gsk/path.c +++ b/testsuite/gsk/path.c @@ -381,7 +381,7 @@ path_operation_print (const PathOperation *p, _g_string_append_point (string, &p->pts[1]); break; - case GSK_PATH_CURVE: + case GSK_PATH_CUBIC: g_string_append (string, " C "); _g_string_append_point (string, &p->pts[1]); g_string_append (string, ", "); @@ -425,7 +425,7 @@ path_operation_equal (const PathOperation *p1, case GSK_PATH_CLOSE: return graphene_point_near (&p1->pts[1], &p2->pts[1], epsilon); - case GSK_PATH_CURVE: + case GSK_PATH_CUBIC: return graphene_point_near (&p1->pts[1], &p2->pts[1], epsilon) && graphene_point_near (&p1->pts[2], &p2->pts[2], epsilon) && graphene_point_near (&p1->pts[3], &p2->pts[3], epsilon); @@ -1063,7 +1063,7 @@ rotate_path_cb (GskPathOperation op, gsk_path_builder_line_to (builders[1], pts[1].y, -pts[1].x); break; - case GSK_PATH_CURVE: + case GSK_PATH_CUBIC: gsk_path_builder_curve_to (builders[0], pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y); gsk_path_builder_curve_to (builders[1], pts[1].y, -pts[1].x, pts[2].y, -pts[2].x, pts[3].y, -pts[3].x); break;