[cairo-commit] cairo/src cairo.c, 1.62, 1.63 cairo_gstate.c, 1.95,
1.96 cairo_path.c, 1.21, 1.22 cairo_path_fill.c, 1.15,
1.16 cairo_path_stroke.c, 1.21, 1.22 cairo_pen.c, 1.21,
1.22 cairoint.h, 1.109, 1.110
Carl Worth
commit at pdx.freedesktop.org
Wed Mar 23 13:50:53 PST 2005
Committed by: cworth
Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv12554/src
Modified Files:
cairo.c cairo_gstate.c cairo_path.c cairo_path_fill.c
cairo_path_stroke.c cairo_pen.c cairoint.h
Log Message:
* src/cairo-gstate-private.h:
* src/cairo-path-fixed-private.h:
* src/cairo-private.h:
* src/cairoint.h: Begin the process of breaking up cairoint.h,
moving structure definitions of cairo_t, cairo_gstate_t, and
cairo_path_real_t into their own header files.
* src/cairo.c:
* src/cairo_gstate.c:
* src/cairo_path.c:
* src/cairo_path_fill.c:
* src/cairo_path_stroke.c:
* src/cairo_pen.c: Track changes to header files, reaching into
the new private headers where necessary.
Index: cairo.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- cairo.c 23 Mar 2005 21:49:33 -0000 1.62
+++ cairo.c 23 Mar 2005 21:50:51 -0000 1.63
@@ -35,6 +35,8 @@
*/
#include "cairoint.h"
+
+#include "cairo-private.h"
#include "cairo-path-data-private.h"
#define CAIRO_TOLERANCE_MINIMUM 0.0002 /* We're limited by 16 bits of sub-pixel precision */
Index: cairo_gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_gstate.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- cairo_gstate.c 21 Mar 2005 07:23:19 -0000 1.95
+++ cairo_gstate.c 23 Mar 2005 21:50:51 -0000 1.96
@@ -39,6 +39,8 @@
#include "cairoint.h"
+#include "cairo-gstate-private.h"
+
static cairo_status_t
_cairo_gstate_clip_and_composite_trapezoids (cairo_gstate_t *gstate,
cairo_pattern_t *src,
Index: cairo_path.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_path.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- cairo_path.c 18 Mar 2005 22:28:53 -0000 1.21
+++ cairo_path.c 23 Mar 2005 21:50:51 -0000 1.22
@@ -37,6 +37,8 @@
#include <stdlib.h>
#include "cairoint.h"
+#include "cairo-path-fixed-private.h"
+
/* private functions */
static cairo_status_t
_cairo_path_add (cairo_path_real_t *path,
Index: cairo_path_fill.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_path_fill.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- cairo_path_fill.c 18 Mar 2005 22:28:53 -0000 1.15
+++ cairo_path_fill.c 23 Mar 2005 21:50:51 -0000 1.16
@@ -36,6 +36,9 @@
#include "cairoint.h"
+#include "cairo-path-fixed-private.h"
+#include "cairo-gstate-private.h"
+
typedef struct cairo_filler {
cairo_gstate_t *gstate;
cairo_traps_t *traps;
Index: cairo_path_stroke.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_path_stroke.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- cairo_path_stroke.c 18 Mar 2005 22:28:53 -0000 1.21
+++ cairo_path_stroke.c 23 Mar 2005 21:50:51 -0000 1.22
@@ -36,6 +36,9 @@
#include "cairoint.h"
+#include "cairo-path-fixed-private.h"
+#include "cairo-gstate-private.h"
+
typedef struct cairo_stroker {
cairo_gstate_t *gstate;
cairo_traps_t *traps;
Index: cairo_pen.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_pen.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- cairo_pen.c 22 Feb 2005 19:35:03 -0000 1.21
+++ cairo_pen.c 23 Mar 2005 21:50:51 -0000 1.22
@@ -36,6 +36,8 @@
#include "cairoint.h"
+#include "cairo-gstate-private.h"
+
static int
_cairo_pen_vertices_needed (double tolerance, double radius, cairo_matrix_t *matrix);
Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- cairoint.h 21 Mar 2005 07:23:19 -0000 1.109
+++ cairoint.h 23 Mar 2005 21:50:51 -0000 1.110
@@ -180,45 +180,12 @@
#define CAIRO_OK(status) ((status) == CAIRO_STATUS_SUCCESS)
-typedef enum cairo_path_op {
- CAIRO_PATH_OP_MOVE_TO = 0,
- CAIRO_PATH_OP_LINE_TO = 1,
- CAIRO_PATH_OP_CURVE_TO = 2,
- CAIRO_PATH_OP_CLOSE_PATH = 3
-} __attribute__ ((packed)) cairo_path_op_t; /* Don't want 32 bits if we can avoid it. */
-
typedef enum cairo_direction {
CAIRO_DIRECTION_FORWARD,
CAIRO_DIRECTION_REVERSE
} cairo_direction_t;
-#define CAIRO_PATH_BUF_SZ 64
-
-typedef struct _cairo_path_op_buf {
- int num_ops;
- cairo_path_op_t op[CAIRO_PATH_BUF_SZ];
-
- struct _cairo_path_op_buf *next, *prev;
-} cairo_path_op_buf_t;
-
-typedef struct _cairo_path_arg_buf {
- int num_points;
- cairo_point_t points[CAIRO_PATH_BUF_SZ];
-
- struct _cairo_path_arg_buf *next, *prev;
-} cairo_path_arg_buf_t;
-
-typedef struct _cairo_path {
- cairo_path_op_buf_t *op_head;
- cairo_path_op_buf_t *op_tail;
-
- cairo_path_arg_buf_t *arg_head;
- cairo_path_arg_buf_t *arg_tail;
-
- cairo_point_t last_move_point;
- cairo_point_t current_point;
- int has_current_point;
-} cairo_path_real_t;
+typedef struct _cairo_path_real cairo_path_real_t;
typedef struct _cairo_edge {
cairo_line_t edge;
@@ -839,55 +806,7 @@
cairo_surface_t *surface;
} cairo_clip_rec_t;
-typedef struct _cairo_gstate {
- cairo_operator_t operator;
-
- double tolerance;
-
- /* stroke style */
- double line_width;
- cairo_line_cap_t line_cap;
- cairo_line_join_t line_join;
- double miter_limit;
-
- cairo_fill_rule_t fill_rule;
-
- double *dash;
- int num_dashes;
- double dash_offset;
-
- char *font_family; /* NULL means CAIRO_FONT_FAMILY_DEFAULT; */
- cairo_font_slant_t font_slant;
- cairo_font_weight_t font_weight;
-
- cairo_font_t *font; /* Specific to the current CTM */
-
- cairo_surface_t *surface;
-
- cairo_pattern_t *pattern;
- double alpha;
-
- cairo_clip_rec_t clip;
-
- double pixels_per_inch;
-
- cairo_matrix_t font_matrix;
-
- cairo_matrix_t ctm;
- cairo_matrix_t ctm_inverse;
-
- cairo_path_real_t path;
-
- cairo_pen_t pen_regular;
-
- struct _cairo_gstate *next;
-} cairo_gstate_t;
-
-struct _cairo {
- unsigned int ref_count;
- cairo_gstate_t *gstate;
- cairo_status_t status;
-};
+typedef struct _cairo_gstate cairo_gstate_t;
typedef struct _cairo_stroke_face {
cairo_point_t ccw;
@@ -926,7 +845,6 @@
cairo_private int
_cairo_fixed_integer_ceil (cairo_fixed_t f);
-
/* cairo_gstate.c */
cairo_private cairo_gstate_t *
_cairo_gstate_create (void);
More information about the cairo-commit
mailing list