From 89060a9bb37503ada773c9026a152690da48531e Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 13 Mar 2009 15:28:20 +0000 Subject: [PATCH] [cogl] Avoid shadowing math.h symbols As usual, y1 and y2 end up shadowing symbols exported by math.h. --- clutter/cogl/cogl-path.h | 108 +++++++++++++------------- clutter/cogl/common/cogl-primitives.c | 30 +++---- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/clutter/cogl/cogl-path.h b/clutter/cogl/cogl-path.h index ad0d02094..cfd5476a0 100644 --- a/clutter/cogl/cogl-path.h +++ b/clutter/cogl/cogl-path.h @@ -52,17 +52,17 @@ G_BEGIN_DECLS /** * cogl_rectangle: - * @x1: X coordinate of the top-left corner - * @y1: Y coordinate of the top-left corner - * @x2: X coordinate of the bottom-right corner - * @y2: Y coordinate of the bottom-right corner + * @x_1: X coordinate of the top-left corner + * @y_1: Y coordinate of the top-left corner + * @x_2: X coordinate of the bottom-right corner + * @y_2: Y coordinate of the bottom-right corner * * Fills a rectangle at the given coordinates with the current source material **/ -void cogl_rectangle (float x1, - float y1, - float x2, - float y2); +void cogl_rectangle (float x_1, + float y_1, + float x_2, + float y_2); /** * cogl_path_fill: @@ -185,10 +185,10 @@ void cogl_path_arc (float center_x, /** * cogl_path_curve_to: - * @x1: X coordinate of the second bezier control point - * @y1: Y coordinate of the second bezier control point - * @x2: X coordinate of the third bezier control point - * @y2: Y coordinate of the third bezier control point + * @x_1: X coordinate of the second bezier control point + * @y_1: Y coordinate of the second bezier control point + * @x_2: X coordinate of the third bezier control point + * @y_2: Y coordinate of the third bezier control point * @x3: X coordinate of the fourth bezier control point * @y3: Y coordinate of the fourth bezier control point * @@ -196,19 +196,19 @@ void cogl_path_arc (float center_x, * second, third and fourth control points and using current pen location * as the first control point. **/ -void cogl_path_curve_to (float x1, - float y1, - float x2, - float y2, - float x3, - float y3); +void cogl_path_curve_to (float x_1, + float y_1, + float x_2, + float y_2, + float x_3, + float y_3); /** * cogl_path_rel_curve_to: - * @x1: X coordinate of the second bezier control point - * @y1: Y coordinate of the second bezier control point - * @x2: X coordinate of the third bezier control point - * @y2: Y coordinate of the third bezier control point + * @x_1: X coordinate of the second bezier control point + * @y_1: Y coordinate of the second bezier control point + * @x_2: X coordinate of the third bezier control point + * @y_2: Y coordinate of the third bezier control point * @x3: X coordinate of the fourth bezier control point * @y3: Y coordinate of the fourth bezier control point * @@ -217,12 +217,12 @@ void cogl_path_curve_to (float x1, * as the first control point. The given coordinates are relative to the * current pen location. */ -void cogl_path_rel_curve_to (float x1, - float y1, - float x2, - float y2, - float x3, - float y3); +void cogl_path_rel_curve_to (float x_1, + float y_1, + float x_2, + float y_2, + float x_3, + float y_3); /** * cogl_path_close: @@ -234,19 +234,19 @@ void cogl_path_close (void); /** * cogl_path_line: - * @x1: X coordinate of the start line vertex - * @y1: Y coordinate of the start line vertex - * @x2: X coordinate of the end line vertex - * @y2: Y coordinate of the end line vertex + * @x_1: X coordinate of the start line vertex + * @y_1: Y coordinate of the start line vertex + * @x_2: X coordinate of the end line vertex + * @y_2: Y coordinate of the end line vertex * * Constructs a straight line shape starting and ending at the given * coordinates. If there is an existing path this will start a new * disjoint sub-path. **/ -void cogl_path_line (float x1, - float y1, - float x2, - float y2); +void cogl_path_line (float x_1, + float y_1, + float x_2, + float y_2); /** * cogl_path_polyline: @@ -267,7 +267,7 @@ void cogl_path_line (float x1, * be constructed. **/ void cogl_path_polyline (float *coords, - gint num_points); + gint num_points); /** @@ -285,23 +285,23 @@ void cogl_path_polyline (float *coords, * fashion for the rest of the vertices. **/ void cogl_path_polygon (float *coords, - gint num_points); + gint num_points); /** * cogl_path_rectangle: - * @x1: X coordinate of the top-left corner. - * @y1: Y coordinate of the top-left corner. - * @x2: X coordinate of the bottom-right corner. - * @y2: Y coordinate of the bottom-right corner. + * @x_1: X coordinate of the top-left corner. + * @y_1: Y coordinate of the top-left corner. + * @x_2: X coordinate of the bottom-right corner. + * @y_2: Y coordinate of the bottom-right corner. * * Constructs a rectangular shape at the given coordinates. If there * is an existing path this will start a new disjoint sub-path. **/ -void cogl_path_rectangle (float x1, - float y1, - float x2, - float y2); +void cogl_path_rectangle (float x_1, + float y_1, + float x_2, + float y_2); /** * cogl_path_ellipse: @@ -320,10 +320,10 @@ void cogl_path_ellipse (float center_x, /** * cogl_path_round_rectangle: - * @x1: X coordinate of the top-left corner. - * @y1: Y coordinate of the top-left corner. - * @x2: X coordinate of the bottom-right corner. - * @y2: Y coordinate of the bottom-right corner. + * @x_1: X coordinate of the top-left corner. + * @y_1: Y coordinate of the top-left corner. + * @x_2: X coordinate of the bottom-right corner. + * @y_2: Y coordinate of the bottom-right corner. * @radius: Radius of the corner arcs. * @arc_step: Angle increment resolution for subdivision of * the corner arcs. @@ -331,10 +331,10 @@ void cogl_path_ellipse (float center_x, * Constructs a rectangular shape with rounded corners. If there is an * existing path this will start a new disjoint sub-path. **/ -void cogl_path_round_rectangle (float x1, - float y1, - float x2, - float y2, +void cogl_path_round_rectangle (float x_1, + float y_1, + float x_2, + float y_2, float radius, float arc_step); diff --git a/clutter/cogl/common/cogl-primitives.c b/clutter/cogl/common/cogl-primitives.c index 853a9907d..e549a89a8 100644 --- a/clutter/cogl/common/cogl-primitives.c +++ b/clutter/cogl/common/cogl-primitives.c @@ -193,15 +193,15 @@ cogl_path_polygon (float *coords, } void -cogl_path_rectangle (float x1, - float y1, - float x2, - float y2) +cogl_path_rectangle (float x_1, + float y_1, + float x_2, + float y_2) { - cogl_path_move_to (x1, y1); - cogl_path_line_to (x2, y1); - cogl_path_line_to (x2, y2); - cogl_path_line_to (x1, y2); + cogl_path_move_to (x_1, y_1); + cogl_path_line_to (x_2, y_1); + cogl_path_line_to (x_2, y_2); + cogl_path_line_to (x_1, y_2); cogl_path_close (); } @@ -327,19 +327,19 @@ cogl_path_ellipse (float center_x, } void -cogl_path_round_rectangle (float x1, - float y1, - float x2, - float y2, +cogl_path_round_rectangle (float x_1, + float y_1, + float x_2, + float y_2, float radius, float arc_step) { - float inner_width = x2 - x1 - radius * 2; - float inner_height = y2 - y1 - radius * 2; + float inner_width = x_2 - x_1 - radius * 2; + float inner_height = y_2 - y_1 - radius * 2; _COGL_GET_CONTEXT (ctx, NO_RETVAL); - cogl_path_move_to (x1, y1 + radius); + cogl_path_move_to (x_1, y_1 + radius); cogl_path_arc_rel (radius, 0, radius, radius, 180,