[Commit] cairo/src cairo.h, 1.4, 1.5 cairo_font.c, 1.2,
1.3 cairo_gstate.c, 1.4, 1.5 cairo_matrix.c, 1.3,
1.4 cairo_path_fill.c, 1.3, 1.4 cairo_path_stroke.c, 1.3,
1.4 cairo_pen.c, 1.4, 1.5 cairo_traps.c, 1.8, 1.9 cairoint.h,
1.8, 1.9
Carl Worth
commit at keithp.com
Tue Aug 26 08:40:20 PDT 2003
Committed by: cworth
Update of /local/src/CVS/cairo/src
In directory home.keithp.com:/tmp/cvs-serv13404/src
Modified Files:
cairo.h cairo_font.c cairo_gstate.c cairo_matrix.c
cairo_path_fill.c cairo_path_stroke.c cairo_pen.c
cairo_traps.c cairoint.h
Log Message:
Added missing underscores to several internal functions.
Index: cairo.h
===================================================================
RCS file: /local/src/CVS/cairo/src/cairo.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cairo.h 1 Aug 2003 05:41:44 -0000 1.4
+++ cairo.h 26 Aug 2003 14:40:17 -0000 1.5
@@ -80,16 +80,16 @@
extern void __external_linkage
cairo_set_target_drawable (cairo_t *cr,
- Display *dpy,
- Drawable drawable);
+ Display *dpy,
+ Drawable drawable);
extern void __external_linkage
cairo_set_target_image (cairo_t *cr,
- char *data,
- cairo_format_t format,
- int width,
- int height,
- int stride);
+ char *data,
+ cairo_format_t format,
+ int width,
+ int height,
+ int stride);
typedef enum cairo_operator {
CAIRO_OPERATOR_CLEAR = PictOpClear,
@@ -329,9 +329,9 @@
extern void __external_linkage
cairo_show_surface (cairo_t *cr,
- cairo_surface_t *surface,
- int width,
- int height);
+ cairo_surface_t *surface,
+ int width,
+ int height);
/* Query functions */
@@ -494,15 +494,15 @@
extern cairo_status_t __external_linkage
cairo_matrix_set_affine (cairo_matrix_t *cr,
- double a, double b,
- double c, double d,
- double tx, double ty);
+ double a, double b,
+ double c, double d,
+ double tx, double ty);
extern cairo_status_t __external_linkage
cairo_matrix_get_affine (cairo_matrix_t *matrix,
- double *a, double *b,
- double *c, double *d,
- double *tx, double *ty);
+ double *a, double *b,
+ double *c, double *d,
+ double *tx, double *ty);
extern cairo_status_t __external_linkage
cairo_matrix_translate (cairo_matrix_t *matrix, double tx, double ty);
Index: cairo_font.c
===================================================================
RCS file: /local/src/CVS/cairo/src/cairo_font.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cairo_font.c 30 Jul 2003 15:30:51 -0000 1.2
+++ cairo_font.c 26 Aug 2003 14:40:17 -0000 1.3
@@ -100,9 +100,9 @@
}
cairo_status_t
-cairo_font_transform (cairo_font_t *font,
- double a, double b,
- double c, double d)
+_cairo_font_transform (cairo_font_t *font,
+ double a, double b,
+ double c, double d)
{
cairo_matrix_t m;
Index: cairo_gstate.c
===================================================================
RCS file: /local/src/CVS/cairo/src/cairo_gstate.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cairo_gstate.c 26 Aug 2003 14:14:41 -0000 1.4
+++ cairo_gstate.c 26 Aug 2003 14:40:17 -0000 1.5
@@ -809,11 +809,11 @@
_cairo_pen_init (&gstate->pen_regular, gstate->line_width / 2.0, gstate);
- cairo_traps_init (&traps);
+ _cairo_traps_init (&traps);
status = _cairo_path_stroke_to_traps (&gstate->path, gstate, &traps);
if (status) {
- cairo_traps_fini (&traps);
+ _cairo_traps_fini (&traps);
return status;
}
@@ -833,7 +833,7 @@
if (gstate->pattern)
cairo_surface_set_matrix (gstate->pattern, &user_to_pattern);
- cairo_traps_fini (&traps);
+ _cairo_traps_fini (&traps);
_cairo_gstate_new_path (gstate);
@@ -939,11 +939,11 @@
cairo_traps_t traps;
cairo_matrix_t user_to_pattern, device_to_pattern;
- cairo_traps_init (&traps);
+ _cairo_traps_init (&traps);
status = _cairo_path_fill_to_traps (&gstate->path, gstate, &traps);
if (status) {
- cairo_traps_fini (&traps);
+ _cairo_traps_fini (&traps);
return status;
}
@@ -963,7 +963,7 @@
if (gstate->pattern)
cairo_surface_set_matrix (gstate->pattern, &user_to_pattern);
- cairo_traps_fini (&traps);
+ _cairo_traps_fini (&traps);
_cairo_gstate_new_path (gstate);
@@ -997,10 +997,10 @@
0.0, 0.0, 0.0, 1.0);
cairo_surface_set_repeat (alpha_one, 1);
- cairo_traps_init (&traps);
+ _cairo_traps_init (&traps);
status = _cairo_path_fill_to_traps (&gstate->path, gstate, &traps);
if (status) {
- cairo_traps_fini (&traps);
+ _cairo_traps_fini (&traps);
return status;
}
@@ -1010,7 +1010,7 @@
gstate->clip.surface,
&traps);
- cairo_traps_fini (&traps);
+ _cairo_traps_fini (&traps);
cairo_surface_destroy (alpha_one);
@@ -1034,8 +1034,8 @@
double a, double b,
double c, double d)
{
- return cairo_font_transform (&gstate->font,
- a, b, c, d);
+ return _cairo_font_transform (&gstate->font,
+ a, b, c, d);
}
cairo_status_t
@@ -1135,9 +1135,9 @@
device_y = 0;
device_width = width;
device_height = height;
- cairo_matrix_transform_bounding_box (&image_to_device,
- &device_x, &device_y,
- &device_width, &device_height);
+ _cairo_matrix_transform_bounding_box (&image_to_device,
+ &device_x, &device_y,
+ &device_width, &device_height);
/* XXX: The rendered size is sometimes 1 or 2 pixels short from
what I expect. Need to fix this. */
Index: cairo_matrix.c
===================================================================
RCS file: /local/src/CVS/cairo/src/cairo_matrix.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cairo_matrix.c 1 Aug 2003 05:49:10 -0000 1.3
+++ cairo_matrix.c 26 Aug 2003 14:40:17 -0000 1.4
@@ -239,9 +239,9 @@
slim_hidden_def(cairo_matrix_transform_point)
cairo_status_t
-cairo_matrix_transform_bounding_box (cairo_matrix_t *matrix,
- double *x, double *y,
- double *width, double *height)
+_cairo_matrix_transform_bounding_box (cairo_matrix_t *matrix,
+ double *x, double *y,
+ double *width, double *height)
{
int i;
double quad_x[4], quad_y[4];
Index: cairo_path_fill.c
===================================================================
RCS file: /local/src/CVS/cairo/src/cairo_path_fill.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cairo_path_fill.c 30 Jul 2003 15:30:51 -0000 1.3
+++ cairo_path_fill.c 26 Aug 2003 14:40:17 -0000 1.4
@@ -127,9 +127,9 @@
{
cairo_filler_t *filler = closure;
- return cairo_traps_tessellate_polygon (filler->traps,
- &filler->polygon,
- filler->gstate->fill_rule);
+ return _cairo_traps_tessellate_polygon (filler->traps,
+ &filler->polygon,
+ filler->gstate->fill_rule);
}
cairo_status_t
Index: cairo_path_stroke.c
===================================================================
RCS file: /local/src/CVS/cairo/src/cairo_path_stroke.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cairo_path_stroke.c 30 Jul 2003 15:30:51 -0000 1.3
+++ cairo_path_stroke.c 26 Aug 2003 14:40:17 -0000 1.4
@@ -194,7 +194,7 @@
while (i != stop) {
tri[2] = in->pt;
_translate_point (&tri[2], &pen->vertex[i].pt);
- cairo_traps_tessellate_triangle (stroker->traps, tri);
+ _cairo_traps_tessellate_triangle (stroker->traps, tri);
tri[1] = tri[2];
i += step;
if (i < 0)
@@ -205,7 +205,7 @@
tri[2] = final;
- return cairo_traps_tessellate_triangle (stroker->traps, tri);
+ return _cairo_traps_tessellate_triangle (stroker->traps, tri);
}
case CAIRO_LINE_JOIN_MITER:
default: {
@@ -246,9 +246,9 @@
_cairo_polygon_add_edge (&polygon, inpt, &outer);
_cairo_polygon_add_edge (&polygon, &outer, outpt);
_cairo_polygon_add_edge (&polygon, outpt, &in->pt);
- status = cairo_traps_tessellate_polygon (stroker->traps,
- &polygon,
- CAIRO_FILL_RULE_WINDING);
+ status = _cairo_traps_tessellate_polygon (stroker->traps,
+ &polygon,
+ CAIRO_FILL_RULE_WINDING);
_cairo_polygon_fini (&polygon);
return status;
@@ -261,7 +261,7 @@
tri[1] = *inpt;
tri[2] = *outpt;
- return cairo_traps_tessellate_triangle (stroker->traps, tri);
+ return _cairo_traps_tessellate_triangle (stroker->traps, tri);
}
}
}
@@ -294,12 +294,12 @@
for (i=start; i != stop; i = (i+1) % pen->num_vertices) {
tri[2] = f->pt;
_translate_point (&tri[2], &pen->vertex[i].pt);
- cairo_traps_tessellate_triangle (stroker->traps, tri);
+ _cairo_traps_tessellate_triangle (stroker->traps, tri);
tri[1] = tri[2];
}
tri[2] = f->ccw;
- return cairo_traps_tessellate_triangle (stroker->traps, tri);
+ return _cairo_traps_tessellate_triangle (stroker->traps, tri);
}
case CAIRO_LINE_CAP_SQUARE: {
double dx, dy;
@@ -326,7 +326,7 @@
_cairo_polygon_add_edge (&polygon, &occw, &f->ccw);
_cairo_polygon_add_edge (&polygon, &f->ccw, &f->cw);
- status = cairo_traps_tessellate_polygon (stroker->traps, &polygon, CAIRO_FILL_RULE_WINDING);
+ status = _cairo_traps_tessellate_polygon (stroker->traps, &polygon, CAIRO_FILL_RULE_WINDING);
_cairo_polygon_fini (&polygon);
return status;
@@ -415,7 +415,7 @@
quad[2] = end->ccw;
quad[3] = end->cw;
- return cairo_traps_tessellate_rectangle (stroker->traps, quad);
+ return _cairo_traps_tessellate_rectangle (stroker->traps, quad);
}
static cairo_status_t
Index: cairo_pen.c
===================================================================
RCS file: /local/src/CVS/cairo/src/cairo_pen.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cairo_pen.c 30 Jul 2003 15:30:51 -0000 1.4
+++ cairo_pen.c 26 Aug 2003 14:40:17 -0000 1.5
@@ -375,7 +375,7 @@
return status;
_cairo_polygon_close (&polygon);
- cairo_traps_tessellate_polygon (traps, &polygon, CAIRO_FILL_RULE_WINDING);
+ _cairo_traps_tessellate_polygon (traps, &polygon, CAIRO_FILL_RULE_WINDING);
_cairo_polygon_fini (&polygon);
return CAIRO_STATUS_SUCCESS;
Index: cairo_traps.c
===================================================================
RCS file: /local/src/CVS/cairo/src/cairo_traps.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cairo_traps.c 1 Aug 2003 05:41:44 -0000 1.8
+++ cairo_traps.c 26 Aug 2003 14:40:17 -0000 1.9
@@ -29,16 +29,16 @@
/* private functions */
static cairo_status_t
-cairo_traps_grow_by (cairo_traps_t *traps, int additional);
+_cairo_traps_grow_by (cairo_traps_t *traps, int additional);
static cairo_status_t
-cairo_traps_add_trap (cairo_traps_t *traps, cairo_fixed_t top, cairo_fixed_t bottom,
- cairo_line_t *left, cairo_line_t *right);
+_cairo_traps_add_trap (cairo_traps_t *traps, cairo_fixed_t top, cairo_fixed_t bottom,
+ cairo_line_t *left, cairo_line_t *right);
static cairo_status_t
-cairo_traps_add_trap_from_points (cairo_traps_t *traps, cairo_fixed_t top, cairo_fixed_t bottom,
- cairo_point_t left_p1, cairo_point_t left_p2,
- cairo_point_t right_p1, cairo_point_t right_p2);
+_cairo_traps_add_trap_from_points (cairo_traps_t *traps, cairo_fixed_t top, cairo_fixed_t bottom,
+ cairo_point_t left_p1, cairo_point_t left_p2,
+ cairo_point_t right_p1, cairo_point_t right_p2);
static int
_compare_point_fixed_by_y (const void *av, const void *bv);
@@ -62,7 +62,7 @@
_line_segs_intersect_ceil (cairo_line_t *left, cairo_line_t *right, cairo_fixed_t *y_ret);
void
-cairo_traps_init (cairo_traps_t *traps)
+_cairo_traps_init (cairo_traps_t *traps)
{
traps->num_traps = 0;
@@ -71,7 +71,7 @@
}
void
-cairo_traps_fini (cairo_traps_t *traps)
+_cairo_traps_fini (cairo_traps_t *traps)
{
if (traps->traps_size) {
free (traps->traps);
@@ -82,8 +82,8 @@
}
static cairo_status_t
-cairo_traps_add_trap (cairo_traps_t *traps, cairo_fixed_t top, cairo_fixed_t bottom,
- cairo_line_t *left, cairo_line_t *right)
+_cairo_traps_add_trap (cairo_traps_t *traps, cairo_fixed_t top, cairo_fixed_t bottom,
+ cairo_line_t *left, cairo_line_t *right)
{
cairo_status_t status;
cairo_trapezoid_t *trap;
@@ -93,7 +93,7 @@
}
if (traps->num_traps >= traps->traps_size) {
- status = cairo_traps_grow_by (traps, CAIRO_TRAPS_GROWTH_INC);
+ status = _cairo_traps_grow_by (traps, CAIRO_TRAPS_GROWTH_INC);
if (status)
return status;
}
@@ -110,9 +110,9 @@
}
static cairo_status_t
-cairo_traps_add_trap_from_points (cairo_traps_t *traps, cairo_fixed_t top, cairo_fixed_t bottom,
- cairo_point_t left_p1, cairo_point_t left_p2,
- cairo_point_t right_p1, cairo_point_t right_p2)
+_cairo_traps_add_trap_from_points (cairo_traps_t *traps, cairo_fixed_t top, cairo_fixed_t bottom,
+ cairo_point_t left_p1, cairo_point_t left_p2,
+ cairo_point_t right_p1, cairo_point_t right_p2)
{
cairo_line_t left;
cairo_line_t right;
@@ -123,11 +123,11 @@
right.p1 = right_p1;
right.p2 = right_p2;
- return cairo_traps_add_trap (traps, top, bottom, &left, &right);
+ return _cairo_traps_add_trap (traps, top, bottom, &left, &right);
}
static cairo_status_t
-cairo_traps_grow_by (cairo_traps_t *traps, int additional)
+_cairo_traps_grow_by (cairo_traps_t *traps, int additional)
{
cairo_trapezoid_t *new_traps;
int old_size = traps->traps_size;
@@ -163,7 +163,7 @@
}
cairo_status_t
-cairo_traps_tessellate_triangle (cairo_traps_t *traps, cairo_point_t t[3])
+_cairo_traps_tessellate_triangle (cairo_traps_t *traps, cairo_point_t t[3])
{
cairo_status_t status;
cairo_line_t line;
@@ -176,15 +176,15 @@
/* horizontal top edge requires special handling */
if (tsort[0].y == tsort[1].y) {
if (tsort[0].x < tsort[1].x)
- status = cairo_traps_add_trap_from_points (traps,
- tsort[1].y, tsort[2].y,
- tsort[0], tsort[2],
- tsort[1], tsort[2]);
+ status = _cairo_traps_add_trap_from_points (traps,
+ tsort[1].y, tsort[2].y,
+ tsort[0], tsort[2],
+ tsort[1], tsort[2]);
else
- status = cairo_traps_add_trap_from_points (traps,
- tsort[1].y, tsort[2].y,
- tsort[1], tsort[2],
- tsort[0], tsort[2]);
+ status = _cairo_traps_add_trap_from_points (traps,
+ tsort[1].y, tsort[2].y,
+ tsort[1], tsort[2],
+ tsort[0], tsort[2]);
return status;
}
@@ -194,29 +194,29 @@
intersect = _compute_x (&line, tsort[2].y);
if (intersect < tsort[2].x) {
- status = cairo_traps_add_trap_from_points (traps,
- tsort[0].y, tsort[1].y,
- tsort[0], tsort[1],
- tsort[0], tsort[2]);
+ status = _cairo_traps_add_trap_from_points (traps,
+ tsort[0].y, tsort[1].y,
+ tsort[0], tsort[1],
+ tsort[0], tsort[2]);
if (status)
return status;
- status = cairo_traps_add_trap_from_points (traps,
- tsort[1].y, tsort[2].y,
- tsort[1], tsort[2],
- tsort[0], tsort[2]);
+ status = _cairo_traps_add_trap_from_points (traps,
+ tsort[1].y, tsort[2].y,
+ tsort[1], tsort[2],
+ tsort[0], tsort[2]);
if (status)
return status;
} else {
- status = cairo_traps_add_trap_from_points (traps,
- tsort[0].y, tsort[1].y,
- tsort[0], tsort[2],
- tsort[0], tsort[1]);
+ status = _cairo_traps_add_trap_from_points (traps,
+ tsort[0].y, tsort[1].y,
+ tsort[0], tsort[2],
+ tsort[0], tsort[1]);
if (status)
return status;
- status = cairo_traps_add_trap_from_points (traps,
- tsort[1].y, tsort[2].y,
- tsort[0], tsort[2],
- tsort[1], tsort[2]);
+ status = _cairo_traps_add_trap_from_points (traps,
+ tsort[1].y, tsort[2].y,
+ tsort[0], tsort[2],
+ tsort[1], tsort[2]);
if (status)
return status;
}
@@ -226,36 +226,36 @@
/* Warning: This function reorders the elements of the array provided. */
cairo_status_t
-cairo_traps_tessellate_rectangle (cairo_traps_t *traps, cairo_point_t q[4])
+_cairo_traps_tessellate_rectangle (cairo_traps_t *traps, cairo_point_t q[4])
{
cairo_status_t status;
qsort (q, 4, sizeof (cairo_point_t), _compare_point_fixed_by_y);
if (q[1].x > q[2].x) {
- status = cairo_traps_add_trap_from_points (traps,
- q[0].y, q[1].y, q[0], q[2], q[0], q[1]);
+ status = _cairo_traps_add_trap_from_points (traps,
+ q[0].y, q[1].y, q[0], q[2], q[0], q[1]);
if (status)
return status;
- status = cairo_traps_add_trap_from_points (traps,
- q[1].y, q[2].y, q[0], q[2], q[1], q[3]);
+ status = _cairo_traps_add_trap_from_points (traps,
+ q[1].y, q[2].y, q[0], q[2], q[1], q[3]);
if (status)
return status;
- status = cairo_traps_add_trap_from_points (traps,
- q[2].y, q[3].y, q[2], q[3], q[1], q[3]);
+ status = _cairo_traps_add_trap_from_points (traps,
+ q[2].y, q[3].y, q[2], q[3], q[1], q[3]);
if (status)
return status;
} else {
- status = cairo_traps_add_trap_from_points (traps,
- q[0].y, q[1].y, q[0], q[1], q[0], q[2]);
+ status = _cairo_traps_add_trap_from_points (traps,
+ q[0].y, q[1].y, q[0], q[1], q[0], q[2]);
if (status)
return status;
- status = cairo_traps_add_trap_from_points (traps,
- q[1].y, q[2].y, q[1], q[3], q[0], q[2]);
+ status = _cairo_traps_add_trap_from_points (traps,
+ q[1].y, q[2].y, q[1], q[3], q[0], q[2]);
if (status)
return status;
- status = cairo_traps_add_trap_from_points (traps,
- q[2].y, q[3].y, q[1], q[3], q[2], q[3]);
+ status = _cairo_traps_add_trap_from_points (traps,
+ q[2].y, q[3].y, q[1], q[3], q[2], q[3]);
if (status)
return status;
}
@@ -468,9 +468,9 @@
Warning: This function obliterates the edges of the polygon provided.
*/
cairo_status_t
-cairo_traps_tessellate_polygon (cairo_traps_t *traps,
- cairo_polygon_t *poly,
- cairo_fill_rule_t fill_rule)
+_cairo_traps_tessellate_polygon (cairo_traps_t *traps,
+ cairo_polygon_t *poly,
+ cairo_fill_rule_t fill_rule)
{
cairo_status_t status;
int i, active, inactive;
@@ -528,7 +528,7 @@
if ((in_out & 1) == 0)
continue;
}
- status = cairo_traps_add_trap (traps, y, y_next, &edges[i].edge, &edges[i+1].edge);
+ status = _cairo_traps_add_trap (traps, y, y_next, &edges[i].edge, &edges[i+1].edge);
if (status)
return status;
}
Index: cairoint.h
===================================================================
RCS file: /local/src/CVS/cairo/src/cairoint.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- cairoint.h 1 Aug 2003 05:41:44 -0000 1.8
+++ cairoint.h 26 Aug 2003 14:40:18 -0000 1.9
@@ -356,7 +356,7 @@
cairo_point_double_t usr_vector;
} cairo_stroke_face_t;
-/* cairo_gstate_t.c */
+/* cairo_gstate.c */
extern cairo_gstate_t * __internal_linkage
_cairo_gstate_create (void);
@@ -565,7 +565,7 @@
int width,
int height);
-/* cairo_color_t.c */
+/* cairo_color.c */
extern void __internal_linkage
_cairo_color_init (cairo_color_t *color);
@@ -581,8 +581,7 @@
extern void __internal_linkage
_cairo_color_set_alpha (cairo_color_t *color, double alpha);
-/* cairo_font_t.c */
-
+/* cairo_font.c */
extern void __internal_linkage
_cairo_font_init (cairo_font_t *font);
@@ -599,14 +598,14 @@
_cairo_font_scale (cairo_font_t *font, double scale);
extern cairo_status_t __internal_linkage
-cairo_font_transform (cairo_font_t *font,
- double a, double b,
- double c, double d);
+_cairo_font_transform (cairo_font_t *font,
+ double a, double b,
+ double c, double d);
extern cairo_status_t __internal_linkage
_cairo_font_resolve_xft_font (cairo_font_t *font, cairo_gstate_t *gstate, XftFont **xft_font);
-/* cairo_path_t.c */
+/* cairo_path.c */
extern void __internal_linkage
_cairo_path_init (cairo_path_t *path);
@@ -640,18 +639,15 @@
extern cairo_status_t __internal_linkage
_cairo_path_bounds (cairo_path_t *path, double *x1, double *y1, double *x2, double *y2);
-/* cairo_path_tfill.c */
-
+/* cairo_path_fill.c */
extern cairo_status_t __internal_linkage
_cairo_path_fill_to_traps (cairo_path_t *path, cairo_gstate_t *gstate, cairo_traps_t *traps);
-/* cairo_path_tstroke.c */
-
+/* cairo_path_stroke.c */
extern cairo_status_t __internal_linkage
_cairo_path_stroke_to_traps (cairo_path_t *path, cairo_gstate_t *gstate, cairo_traps_t *traps);
-/* cairo_surface_t.c */
-
+/* cairo_surface.c */
extern void __internal_linkage
_cairo_surface_reference (cairo_surface_t *surface);
@@ -700,7 +696,7 @@
extern void __internal_linkage
_cairo_surface_push_image (cairo_surface_t *surface);
-/* cairo_pen_t.c */
+/* cairo_pen.c */
extern cairo_status_t __internal_linkage
_cairo_pen_init (cairo_pen_t *pen, double radius, cairo_gstate_t *gstate);
@@ -739,7 +735,7 @@
double tolerance,
cairo_traps_t *traps);
-/* cairo_polygon_t.c */
+/* cairo_polygon.c */
extern void __internal_linkage
_cairo_polygon_init (cairo_polygon_t *polygon);
@@ -755,7 +751,7 @@
extern cairo_status_t __internal_linkage
_cairo_polygon_close (cairo_polygon_t *polygon);
-/* cairo_spline_t.c */
+/* cairo_spline.c */
extern cairo_int_status_t __internal_linkage
_cairo_spline_init (cairo_spline_t *spline,
cairo_point_t *a,
@@ -769,7 +765,7 @@
extern void __internal_linkage
_cairo_spline_fini (cairo_spline_t *spline);
-/* cairo_matrix_t.c */
+/* cairo_matrix.c */
extern void __internal_linkage
_cairo_matrix_init (cairo_matrix_t *matrix);
@@ -789,9 +785,9 @@
double angle);
extern cairo_status_t __internal_linkage
-cairo_matrix_transform_bounding_box (cairo_matrix_t *matrix,
- double *x, double *y,
- double *width, double *height);
+_cairo_matrix_transform_bounding_box (cairo_matrix_t *matrix,
+ double *x, double *y,
+ double *width, double *height);
extern cairo_status_t __internal_linkage
_cairo_matrix_compute_determinant (cairo_matrix_t *matrix, double *det);
@@ -801,24 +797,23 @@
/* cairo_traps.c */
extern void __internal_linkage
-cairo_traps_init (cairo_traps_t *traps);
+_cairo_traps_init (cairo_traps_t *traps);
extern void __internal_linkage
-cairo_traps_fini (cairo_traps_t *traps);
+_cairo_traps_fini (cairo_traps_t *traps);
extern cairo_status_t __internal_linkage
-cairo_traps_tessellate_triangle (cairo_traps_t *traps, cairo_point_t t[3]);
+_cairo_traps_tessellate_triangle (cairo_traps_t *traps, cairo_point_t t[3]);
extern cairo_status_t __internal_linkage
-cairo_traps_tessellate_rectangle (cairo_traps_t *traps, cairo_point_t q[4]);
+_cairo_traps_tessellate_rectangle (cairo_traps_t *traps, cairo_point_t q[4]);
extern cairo_status_t __internal_linkage
-cairo_traps_tessellate_polygon (cairo_traps_t *traps,
- cairo_polygon_t *poly,
- cairo_fill_rule_t fill_rule);
+_cairo_traps_tessellate_polygon (cairo_traps_t *traps,
+ cairo_polygon_t *poly,
+ cairo_fill_rule_t fill_rule);
/* cairo_slope.c */
-
extern void __internal_linkage
_cairo_slope_init (cairo_slope_t *slope, cairo_point_t *a, cairo_point_t *b);
More information about the Commit
mailing list