diff options
Diffstat (limited to 'src/cairo.c')
| -rw-r--r-- | src/cairo.c | 192 |
1 files changed, 188 insertions, 4 deletions
diff --git a/src/cairo.c b/src/cairo.c index d173ca767..064cc7f2f 100644 --- a/src/cairo.c +++ b/src/cairo.c @@ -29,6 +29,34 @@ #define CAIRO_TOLERANCE_MINIMUM 0.0002 /* We're limited by 16 bits of sub-pixel precision */ + +#ifdef CAIRO_DO_SANITY_CHECKING +#include <assert.h> +static int +cairo_sane_state (cairo_t *cr) +{ + switch (cr->status) { + case CAIRO_STATUS_SUCCESS: + case CAIRO_STATUS_NO_MEMORY: + case CAIRO_STATUS_INVALID_RESTORE: + case CAIRO_STATUS_INVALID_POP_GROUP: + case CAIRO_STATUS_NO_CURRENT_POINT: + case CAIRO_STATUS_INVALID_MATRIX: + case CAIRO_STATUS_NO_TARGET_SURFACE: + case CAIRO_STATUS_NULL_POINTER: + break; + default: + printf ("cairo status is bad: %d\n", cr->status); + return 0; + } + return 1; +} +#define CAIRO_CHECK_SANITY(cr) assert(cairo_sane_state ((cr))) +#else +#define CAIRO_CHECK_SANITY(cr) +#endif + + cairo_t * cairo_create (void) { @@ -45,21 +73,25 @@ cairo_create (void) if (cr->gstate == NULL) cr->status = CAIRO_STATUS_NO_MEMORY; + CAIRO_CHECK_SANITY (cr); return cr; } void cairo_reference (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->ref_count++; + CAIRO_CHECK_SANITY (cr); } void cairo_destroy (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); cr->ref_count--; if (cr->ref_count) return; @@ -79,6 +111,7 @@ cairo_save (cairo_t *cr) { cairo_gstate_t *top; + CAIRO_CHECK_SANITY (cr); if (cr->status) return; @@ -90,11 +123,13 @@ cairo_save (cairo_t *cr) if (top == NULL) { cr->status = CAIRO_STATUS_NO_MEMORY; + CAIRO_CHECK_SANITY (cr); return; } top->next = cr->gstate; cr->gstate = top; + CAIRO_CHECK_SANITY (cr); } slim_hidden_def(cairo_save); @@ -103,6 +138,7 @@ cairo_restore (cairo_t *cr) { cairo_gstate_t *top; + CAIRO_CHECK_SANITY (cr); if (cr->status) return; @@ -113,12 +149,15 @@ cairo_restore (cairo_t *cr) if (cr->gstate == NULL) cr->status = CAIRO_STATUS_INVALID_RESTORE; + CAIRO_CHECK_SANITY (cr); } slim_hidden_def(cairo_restore); void cairo_copy (cairo_t *dest, cairo_t *src) { + CAIRO_CHECK_SANITY (src); + CAIRO_CHECK_SANITY (dest); if (dest->status) return; @@ -128,6 +167,8 @@ cairo_copy (cairo_t *dest, cairo_t *src) } dest->status = _cairo_gstate_copy (dest->gstate, src->gstate); + CAIRO_CHECK_SANITY (src); + CAIRO_CHECK_SANITY (dest); } /* XXX: I want to rethink this API @@ -161,10 +202,12 @@ cairo_pop_group (cairo_t *cr) void cairo_set_target_surface (cairo_t *cr, cairo_surface_t *surface) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_set_target_surface (cr->gstate, surface); + CAIRO_CHECK_SANITY (cr); } slim_hidden_def(cairo_set_target_surface); @@ -178,6 +221,7 @@ cairo_set_target_image (cairo_t *cr, { cairo_surface_t *surface; + CAIRO_CHECK_SANITY (cr); if (cr->status) return; @@ -186,26 +230,31 @@ cairo_set_target_image (cairo_t *cr, width, height, stride); if (surface == NULL) { cr->status = CAIRO_STATUS_NO_MEMORY; + CAIRO_CHECK_SANITY (cr); return; } cairo_set_target_surface (cr, surface); cairo_surface_destroy (surface); + CAIRO_CHECK_SANITY (cr); } void cairo_set_operator (cairo_t *cr, cairo_operator_t op) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_set_operator (cr->gstate, op); + CAIRO_CHECK_SANITY (cr); } void cairo_set_rgb_color (cairo_t *cr, double red, double green, double blue) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; @@ -214,228 +263,276 @@ cairo_set_rgb_color (cairo_t *cr, double red, double green, double blue) _cairo_restrict_value (&blue, 0.0, 1.0); cr->status = _cairo_gstate_set_rgb_color (cr->gstate, red, green, blue); + CAIRO_CHECK_SANITY (cr); } void cairo_set_pattern (cairo_t *cr, cairo_pattern_t *pattern) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_set_pattern (cr->gstate, pattern); + CAIRO_CHECK_SANITY (cr); } cairo_pattern_t * cairo_current_pattern (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); return _cairo_gstate_current_pattern (cr->gstate); } void cairo_set_tolerance (cairo_t *cr, double tolerance) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; _cairo_restrict_value (&tolerance, CAIRO_TOLERANCE_MINIMUM, tolerance); cr->status = _cairo_gstate_set_tolerance (cr->gstate, tolerance); + CAIRO_CHECK_SANITY (cr); } void cairo_set_alpha (cairo_t *cr, double alpha) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; _cairo_restrict_value (&alpha, 0.0, 1.0); cr->status = _cairo_gstate_set_alpha (cr->gstate, alpha); + CAIRO_CHECK_SANITY (cr); } void cairo_set_fill_rule (cairo_t *cr, cairo_fill_rule_t fill_rule) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_set_fill_rule (cr->gstate, fill_rule); + CAIRO_CHECK_SANITY (cr); } void cairo_set_line_width (cairo_t *cr, double width) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; _cairo_restrict_value (&width, 0.0, width); cr->status = _cairo_gstate_set_line_width (cr->gstate, width); + CAIRO_CHECK_SANITY (cr); } void cairo_set_line_cap (cairo_t *cr, cairo_line_cap_t line_cap) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_set_line_cap (cr->gstate, line_cap); + CAIRO_CHECK_SANITY (cr); } void cairo_set_line_join (cairo_t *cr, cairo_line_join_t line_join) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_set_line_join (cr->gstate, line_join); + CAIRO_CHECK_SANITY (cr); } void cairo_set_dash (cairo_t *cr, double *dashes, int ndash, double offset) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_set_dash (cr->gstate, dashes, ndash, offset); + CAIRO_CHECK_SANITY (cr); } void cairo_set_miter_limit (cairo_t *cr, double limit) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_set_miter_limit (cr->gstate, limit); + CAIRO_CHECK_SANITY (cr); } void cairo_translate (cairo_t *cr, double tx, double ty) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_translate (cr->gstate, tx, ty); + CAIRO_CHECK_SANITY (cr); } void cairo_scale (cairo_t *cr, double sx, double sy) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_scale (cr->gstate, sx, sy); + CAIRO_CHECK_SANITY (cr); } void cairo_rotate (cairo_t *cr, double angle) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_rotate (cr->gstate, angle); + CAIRO_CHECK_SANITY (cr); } void cairo_concat_matrix (cairo_t *cr, cairo_matrix_t *matrix) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_concat_matrix (cr->gstate, matrix); + CAIRO_CHECK_SANITY (cr); } void cairo_set_matrix (cairo_t *cr, cairo_matrix_t *matrix) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_set_matrix (cr->gstate, matrix); + CAIRO_CHECK_SANITY (cr); } void cairo_default_matrix (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_default_matrix (cr->gstate); + CAIRO_CHECK_SANITY (cr); } void cairo_identity_matrix (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_identity_matrix (cr->gstate); + CAIRO_CHECK_SANITY (cr); } void cairo_transform_point (cairo_t *cr, double *x, double *y) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_transform_point (cr->gstate, x, y); + CAIRO_CHECK_SANITY (cr); } void cairo_transform_distance (cairo_t *cr, double *dx, double *dy) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_transform_distance (cr->gstate, dx, dy); + CAIRO_CHECK_SANITY (cr); } void cairo_inverse_transform_point (cairo_t *cr, double *x, double *y) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_inverse_transform_point (cr->gstate, x, y); + CAIRO_CHECK_SANITY (cr); } void cairo_inverse_transform_distance (cairo_t *cr, double *dx, double *dy) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_inverse_transform_distance (cr->gstate, dx, dy); + CAIRO_CHECK_SANITY (cr); } void cairo_new_path (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_new_path (cr->gstate); + CAIRO_CHECK_SANITY (cr); } void cairo_move_to (cairo_t *cr, double x, double y) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_move_to (cr->gstate, x, y); + CAIRO_CHECK_SANITY (cr); } slim_hidden_def(cairo_move_to); void cairo_line_to (cairo_t *cr, double x, double y) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_line_to (cr->gstate, x, y); + CAIRO_CHECK_SANITY (cr); } void @@ -444,6 +541,7 @@ cairo_curve_to (cairo_t *cr, double x2, double y2, double x3, double y3) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; @@ -451,6 +549,7 @@ cairo_curve_to (cairo_t *cr, x1, y1, x2, y2, x3, y3); + CAIRO_CHECK_SANITY (cr); } void @@ -459,6 +558,7 @@ cairo_arc (cairo_t *cr, double radius, double angle1, double angle2) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; @@ -466,6 +566,7 @@ cairo_arc (cairo_t *cr, xc, yc, radius, angle1, angle2); + CAIRO_CHECK_SANITY (cr); } void @@ -474,6 +575,7 @@ cairo_arc_negative (cairo_t *cr, double radius, double angle1, double angle2) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; @@ -481,6 +583,7 @@ cairo_arc_negative (cairo_t *cr, xc, yc, radius, angle1, angle2); + CAIRO_CHECK_SANITY (cr); } /* XXX: NYI @@ -503,19 +606,23 @@ cairo_arc_to (cairo_t *cr, void cairo_rel_move_to (cairo_t *cr, double dx, double dy) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_rel_move_to (cr->gstate, dx, dy); + CAIRO_CHECK_SANITY (cr); } void cairo_rel_line_to (cairo_t *cr, double dx, double dy) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_rel_line_to (cr->gstate, dx, dy); + CAIRO_CHECK_SANITY (cr); } slim_hidden_def(cairo_rel_line_to); @@ -525,6 +632,7 @@ cairo_rel_curve_to (cairo_t *cr, double dx2, double dy2, double dx3, double dy3) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; @@ -532,6 +640,7 @@ cairo_rel_curve_to (cairo_t *cr, dx1, dy1, dx2, dy2, dx3, dy3); + CAIRO_CHECK_SANITY (cr); } void @@ -539,6 +648,7 @@ cairo_rectangle (cairo_t *cr, double x, double y, double width, double height) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; @@ -547,6 +657,7 @@ cairo_rectangle (cairo_t *cr, cairo_rel_line_to (cr, 0, height); cairo_rel_line_to (cr, -width, 0); cairo_close_path (cr); + CAIRO_CHECK_SANITY (cr); } /* XXX: NYI @@ -563,47 +674,57 @@ cairo_stroke_path (cairo_t *cr) void cairo_close_path (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_close_path (cr->gstate); + CAIRO_CHECK_SANITY (cr); } slim_hidden_def(cairo_close_path); void cairo_stroke (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_stroke (cr->gstate); + CAIRO_CHECK_SANITY (cr); } void cairo_fill (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_fill (cr->gstate); + CAIRO_CHECK_SANITY (cr); } void cairo_copy_page (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_copy_page (cr->gstate); + CAIRO_CHECK_SANITY (cr); } void cairo_show_page (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_show_page (cr->gstate); + CAIRO_CHECK_SANITY (cr); } int @@ -611,11 +732,14 @@ cairo_in_stroke (cairo_t *cr, double x, double y) { int inside; + CAIRO_CHECK_SANITY (cr); if (cr->status) return 0; cr->status = _cairo_gstate_in_stroke (cr->gstate, x, y, &inside); + CAIRO_CHECK_SANITY (cr); + if (cr->status) return 0; @@ -627,11 +751,14 @@ cairo_in_fill (cairo_t *cr, double x, double y) { int inside; + CAIRO_CHECK_SANITY (cr); if (cr->status) return 0; cr->status = _cairo_gstate_in_fill (cr->gstate, x, y, &inside); + CAIRO_CHECK_SANITY (cr); + if (cr->status) return 0; @@ -642,38 +769,46 @@ void cairo_stroke_extents (cairo_t *cr, double *x1, double *y1, double *x2, double *y2) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_stroke_extents (cr->gstate, x1, y1, x2, y2); + CAIRO_CHECK_SANITY (cr); } void cairo_fill_extents (cairo_t *cr, double *x1, double *y1, double *x2, double *y2) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_fill_extents (cr->gstate, x1, y1, x2, y2); + CAIRO_CHECK_SANITY (cr); } void cairo_init_clip (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_init_clip (cr->gstate); + CAIRO_CHECK_SANITY (cr); } void cairo_clip (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_clip (cr->gstate); + CAIRO_CHECK_SANITY (cr); } void @@ -682,60 +817,72 @@ cairo_select_font (cairo_t *cr, cairo_font_slant_t slant, cairo_font_weight_t weight) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_select_font (cr->gstate, family, slant, weight); + CAIRO_CHECK_SANITY (cr); } cairo_font_t * cairo_current_font (cairo_t *cr) { - cairo_font_t *ret; + cairo_font_t *ret; + CAIRO_CHECK_SANITY (cr); if (cr->status) return NULL; cr->status = _cairo_gstate_current_font (cr->gstate, &ret); + CAIRO_CHECK_SANITY (cr); return ret; } void -cairo_current_font_extents (cairo_t *ct, +cairo_current_font_extents (cairo_t *cr, cairo_font_extents_t *extents) { - if (ct->status) + CAIRO_CHECK_SANITY (cr); + if (cr->status) return; - ct->status = _cairo_gstate_current_font_extents (ct->gstate, extents); + cr->status = _cairo_gstate_current_font_extents (cr->gstate, extents); + CAIRO_CHECK_SANITY (cr); } void cairo_set_font (cairo_t *cr, cairo_font_t *font) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_set_font (cr->gstate, font); + CAIRO_CHECK_SANITY (cr); } void cairo_scale_font (cairo_t *cr, double scale) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_scale_font (cr->gstate, scale); + CAIRO_CHECK_SANITY (cr); } void cairo_transform_font (cairo_t *cr, cairo_matrix_t *matrix) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_transform_font (cr->gstate, matrix); + CAIRO_CHECK_SANITY (cr); } void @@ -743,10 +890,12 @@ cairo_text_extents (cairo_t *cr, const unsigned char *utf8, cairo_text_extents_t *extents) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_text_extents (cr->gstate, utf8, extents); + CAIRO_CHECK_SANITY (cr); } void @@ -755,47 +904,60 @@ cairo_glyph_extents (cairo_t *cr, int num_glyphs, cairo_text_extents_t *extents) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_glyph_extents (cr->gstate, glyphs, num_glyphs, extents); + CAIRO_CHECK_SANITY (cr); } void cairo_show_text (cairo_t *cr, const unsigned char *utf8) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; + if (utf8 == NULL) + return; + cr->status = _cairo_gstate_show_text (cr->gstate, utf8); + CAIRO_CHECK_SANITY (cr); } void cairo_show_glyphs (cairo_t *cr, cairo_glyph_t *glyphs, int num_glyphs) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_show_glyphs (cr->gstate, glyphs, num_glyphs); + CAIRO_CHECK_SANITY (cr); } void cairo_text_path (cairo_t *cr, const unsigned char *utf8) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_text_path (cr->gstate, utf8); + CAIRO_CHECK_SANITY (cr); } void cairo_glyph_path (cairo_t *cr, cairo_glyph_t *glyphs, int num_glyphs) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_glyph_path (cr->gstate, glyphs, num_glyphs); + CAIRO_CHECK_SANITY (cr); } void @@ -804,16 +966,19 @@ cairo_show_surface (cairo_t *cr, int width, int height) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; cr->status = _cairo_gstate_show_surface (cr->gstate, surface, width, height); + CAIRO_CHECK_SANITY (cr); } cairo_operator_t cairo_current_operator (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); return _cairo_gstate_current_operator (cr->gstate); } DEPRECATE (cairo_get_operator, cairo_current_operator); @@ -821,13 +986,16 @@ DEPRECATE (cairo_get_operator, cairo_current_operator); void cairo_current_rgb_color (cairo_t *cr, double *red, double *green, double *blue) { + CAIRO_CHECK_SANITY (cr); _cairo_gstate_current_rgb_color (cr->gstate, red, green, blue); + CAIRO_CHECK_SANITY (cr); } DEPRECATE (cairo_get_rgb_color, cairo_current_rgb_color); double cairo_current_alpha (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); return _cairo_gstate_current_alpha (cr->gstate); } DEPRECATE (cairo_get_alpha, cairo_current_alpha); @@ -835,6 +1003,7 @@ DEPRECATE (cairo_get_alpha, cairo_current_alpha); double cairo_current_tolerance (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); return _cairo_gstate_current_tolerance (cr->gstate); } DEPRECATE (cairo_get_tolerance, cairo_current_tolerance); @@ -842,13 +1011,16 @@ DEPRECATE (cairo_get_tolerance, cairo_current_tolerance); void cairo_current_point (cairo_t *cr, double *x, double *y) { + CAIRO_CHECK_SANITY (cr); _cairo_gstate_current_point (cr->gstate, x, y); + CAIRO_CHECK_SANITY (cr); } DEPRECATE (cairo_get_current_point, cairo_current_point); cairo_fill_rule_t cairo_current_fill_rule (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); return _cairo_gstate_current_fill_rule (cr->gstate); } DEPRECATE (cairo_get_fill_rule, cairo_current_fill_rule); @@ -856,6 +1028,7 @@ DEPRECATE (cairo_get_fill_rule, cairo_current_fill_rule); double cairo_current_line_width (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); return _cairo_gstate_current_line_width (cr->gstate); } DEPRECATE (cairo_get_line_width, cairo_current_line_width); @@ -863,6 +1036,7 @@ DEPRECATE (cairo_get_line_width, cairo_current_line_width); cairo_line_cap_t cairo_current_line_cap (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); return _cairo_gstate_current_line_cap (cr->gstate); } DEPRECATE (cairo_get_line_cap, cairo_current_line_cap); @@ -870,6 +1044,7 @@ DEPRECATE (cairo_get_line_cap, cairo_current_line_cap); cairo_line_join_t cairo_current_line_join (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); return _cairo_gstate_current_line_join (cr->gstate); } DEPRECATE (cairo_get_line_join, cairo_current_line_join); @@ -877,6 +1052,7 @@ DEPRECATE (cairo_get_line_join, cairo_current_line_join); double cairo_current_miter_limit (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); return _cairo_gstate_current_miter_limit (cr->gstate); } DEPRECATE (cairo_get_miter_limit, cairo_current_miter_limit); @@ -884,13 +1060,16 @@ DEPRECATE (cairo_get_miter_limit, cairo_current_miter_limit); void cairo_current_matrix (cairo_t *cr, cairo_matrix_t *matrix) { + CAIRO_CHECK_SANITY (cr); _cairo_gstate_current_matrix (cr->gstate, matrix); + CAIRO_CHECK_SANITY (cr); } DEPRECATE (cairo_get_matrix, cairo_current_matrix); cairo_surface_t * cairo_current_target_surface (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); return _cairo_gstate_current_target_surface (cr->gstate); } DEPRECATE (cairo_get_target_surface, cairo_current_target_surface); @@ -903,6 +1082,7 @@ cairo_current_path (cairo_t *cr, cairo_close_path_func_t *close_path, void *closure) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; @@ -912,6 +1092,7 @@ cairo_current_path (cairo_t *cr, curve_to, close_path, closure); + CAIRO_CHECK_SANITY (cr); } void @@ -921,6 +1102,7 @@ cairo_current_path_flat (cairo_t *cr, cairo_close_path_func_t *close_path, void *closure) { + CAIRO_CHECK_SANITY (cr); if (cr->status) return; @@ -930,11 +1112,13 @@ cairo_current_path_flat (cairo_t *cr, NULL, close_path, closure); + CAIRO_CHECK_SANITY (cr); } cairo_status_t cairo_status (cairo_t *cr) { + CAIRO_CHECK_SANITY (cr); return cr->status; } DEPRECATE (cairo_get_status, cairo_status); |