diff options
30 files changed, 212 insertions, 213 deletions
diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c index 019dc303..b777abc1 100644 --- a/src/cairo-analysis-surface.c +++ b/src/cairo-analysis-surface.c @@ -397,9 +397,9 @@ _cairo_analysis_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) @@ -832,9 +832,9 @@ typedef cairo_int_status_t cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip); diff --git a/src/cairo-paginated-surface.c b/src/cairo-paginated-surface.c index b5f619b0..80e4b72f 100644 --- a/src/cairo-paginated-surface.c +++ b/src/cairo-paginated-surface.c @@ -544,9 +544,9 @@ _cairo_paginated_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) diff --git a/src/cairo-path-bounds.c b/src/cairo-path-bounds.c index d3bc449a..7b7ae680 100644 --- a/src/cairo-path-bounds.c +++ b/src/cairo-path-bounds.c @@ -246,8 +246,8 @@ _cairo_path_fixed_fill_extents (const cairo_path_fixed_t *path, /* Adjusts the fill extents (above) by the device-space pen. */ void _cairo_path_fixed_approximate_stroke_extents (const cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - const cairo_matrix_t *ctm, + const cairo_stroke_style_t *style, + const const cairo_matrix_t *ctm, cairo_rectangle_int_t *extents) { cairo_path_bounder_t bounder; @@ -295,7 +295,7 @@ _cairo_path_fixed_approximate_stroke_extents (const cairo_path_fixed_t *path, cairo_status_t _cairo_path_fixed_stroke_extents (const cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, + const cairo_stroke_style_t *stroke_style, const cairo_matrix_t *ctm, const cairo_matrix_t *ctm_inverse, double tolerance, diff --git a/src/cairo-path-stroke.c b/src/cairo-path-stroke.c index 9c79d77d..264157f5 100644 --- a/src/cairo-path-stroke.c +++ b/src/cairo-path-stroke.c @@ -57,7 +57,7 @@ typedef struct _cairo_stroker_dash { } cairo_stroker_dash_t; typedef struct cairo_stroker { - cairo_stroke_style_t *style; + cairo_stroke_style_t style; const cairo_matrix_t *ctm; const cairo_matrix_t *ctm_inverse; @@ -164,14 +164,14 @@ _cairo_stroker_dash_init (cairo_stroker_dash_t *dash, static cairo_status_t _cairo_stroker_init (cairo_stroker_t *stroker, - cairo_stroke_style_t *stroke_style, + const cairo_stroke_style_t *stroke_style, const cairo_matrix_t *ctm, const cairo_matrix_t *ctm_inverse, double tolerance) { cairo_status_t status; - stroker->style = stroke_style; + stroker->style = *stroke_style; stroker->ctm = ctm; stroker->ctm_inverse = ctm_inverse; stroker->tolerance = tolerance; @@ -214,7 +214,7 @@ _cairo_stroker_limit (cairo_stroker_t *stroker, * of the bounds but which might generate rendering that's within bounds. */ - _cairo_stroke_style_max_distance_from_path (stroker->style, stroker->ctm, + _cairo_stroke_style_max_distance_from_path (&stroker->style, stroker->ctm, &dx, &dy); fdx = _cairo_fixed_from_double (dx); @@ -457,7 +457,7 @@ _cairo_stroker_join (cairo_stroker_t *stroker, outpt = &out->cw; } - switch (stroker->style->line_join) { + switch (stroker->style.line_join) { case CAIRO_LINE_JOIN_ROUND: /* construct a fan around the common midpoint */ return _tessellate_fan (stroker, @@ -471,7 +471,7 @@ _cairo_stroker_join (cairo_stroker_t *stroker, /* dot product of incoming slope vector with outgoing slope vector */ double in_dot_out = -in->usr_vector.x * out->usr_vector.x + -in->usr_vector.y * out->usr_vector.y; - double ml = stroker->style->miter_limit; + double ml = stroker->style.miter_limit; /* Check the miter limit -- lines meeting at an acute angle * can generate long miters, the limit converts them to bevel @@ -666,7 +666,7 @@ static cairo_status_t _cairo_stroker_add_cap (cairo_stroker_t *stroker, const cairo_stroke_face_t *f) { - switch (stroker->style->line_cap) { + switch (stroker->style.line_cap) { case CAIRO_LINE_CAP_ROUND: { cairo_slope_t slope; @@ -688,8 +688,8 @@ _cairo_stroker_add_cap (cairo_stroker_t *stroker, dx = f->usr_vector.x; dy = f->usr_vector.y; - dx *= stroker->style->line_width / 2.0; - dy *= stroker->style->line_width / 2.0; + dx *= stroker->style.line_width / 2.0; + dy *= stroker->style.line_width / 2.0; cairo_matrix_transform_distance (stroker->ctm, &dx, &dy); fvector.dx = _cairo_fixed_from_double (dx); fvector.dy = _cairo_fixed_from_double (dy); @@ -827,13 +827,13 @@ _compute_face (const cairo_point_t *point, cairo_slope_t *dev_slope, */ if (stroker->ctm_det_positive) { - face_dx = - slope_dy * (stroker->style->line_width / 2.0); - face_dy = slope_dx * (stroker->style->line_width / 2.0); + face_dx = - slope_dy * (stroker->style.line_width / 2.0); + face_dy = slope_dx * (stroker->style.line_width / 2.0); } else { - face_dx = slope_dy * (stroker->style->line_width / 2.0); - face_dy = - slope_dx * (stroker->style->line_width / 2.0); + face_dx = slope_dy * (stroker->style.line_width / 2.0); + face_dy = - slope_dx * (stroker->style.line_width / 2.0); } /* back to device space */ @@ -867,7 +867,7 @@ _cairo_stroker_add_caps (cairo_stroker_t *stroker) if (stroker->has_initial_sub_path && ! stroker->has_first_face && ! stroker->has_current_face - && stroker->style->line_cap == CAIRO_LINE_JOIN_ROUND) + && stroker->style.line_cap == CAIRO_LINE_JOIN_ROUND) { /* pick an arbitrary slope to use */ double dx = 1.0, dy = 0.0; @@ -1232,8 +1232,8 @@ _cairo_stroker_curve_to (void *closure, /* Temporarily modify the stroker to use round joins to guarantee * smooth stroked curves. */ - line_join_save = stroker->style->line_join; - stroker->style->line_join = CAIRO_LINE_JOIN_ROUND; + line_join_save = stroker->style.line_join; + stroker->style.line_join = CAIRO_LINE_JOIN_ROUND; status = _cairo_spline_decompose (&spline, stroker->tolerance); if (unlikely (status)) @@ -1259,7 +1259,7 @@ _cairo_stroker_curve_to (void *closure, stroker->current_face = face; } - stroker->style->line_join = line_join_save; + stroker->style.line_join = line_join_save; return CAIRO_STATUS_SUCCESS; } @@ -1300,9 +1300,9 @@ _cairo_stroker_close_path (void *closure) cairo_status_t _cairo_path_fixed_stroke_to_shaper (cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_status_t (*add_triangle) (void *closure, const cairo_point_t triangle[3]), @@ -1351,7 +1351,7 @@ BAIL: cairo_status_t _cairo_path_fixed_stroke_to_polygon (const cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, + const cairo_stroke_style_t *stroke_style, const cairo_matrix_t *ctm, const cairo_matrix_t *ctm_inverse, double tolerance, @@ -1395,7 +1395,7 @@ BAIL: cairo_status_t _cairo_path_fixed_stroke_to_traps (const cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, + const cairo_stroke_style_t *stroke_style, const cairo_matrix_t *ctm, const cairo_matrix_t *ctm_inverse, double tolerance, @@ -1422,11 +1422,11 @@ _cairo_path_fixed_stroke_to_traps (const cairo_path_fixed_t *path, _cairo_polygon_limit (&polygon, traps->limits, traps->num_limits); status = _cairo_path_fixed_stroke_to_polygon (path, - stroke_style, - ctm, - ctm_inverse, - tolerance, - &polygon); + stroke_style, + ctm, + ctm_inverse, + tolerance, + &polygon); if (unlikely (status)) goto BAIL; @@ -1450,7 +1450,7 @@ typedef struct _segment_t { } segment_t; typedef struct _cairo_rectilinear_stroker { - cairo_stroke_style_t *stroke_style; + const cairo_stroke_style_t *stroke_style; const cairo_matrix_t *ctm; cairo_fixed_t half_line_width; @@ -1487,7 +1487,7 @@ _cairo_rectilinear_stroker_limit (cairo_rectilinear_stroker_t *stroker, static void _cairo_rectilinear_stroker_init (cairo_rectilinear_stroker_t *stroker, - cairo_stroke_style_t *stroke_style, + const cairo_stroke_style_t *stroke_style, const cairo_matrix_t *ctm, cairo_traps_t *traps) { @@ -1979,7 +1979,7 @@ _cairo_rectilinear_stroker_close_path (void *closure) cairo_int_status_t _cairo_path_fixed_stroke_rectilinear_to_traps (const cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, + const cairo_stroke_style_t *stroke_style, const cairo_matrix_t *ctm, cairo_traps_t *traps) { diff --git a/src/cairo-pdf-operators-private.h b/src/cairo-pdf-operators-private.h index 4ef0fcae..839ae55d 100644 --- a/src/cairo-pdf-operators-private.h +++ b/src/cairo-pdf-operators-private.h @@ -132,16 +132,16 @@ _cairo_pdf_operators_clip (cairo_pdf_operators_t *pdf_operators, cairo_fill_rule_t fill_rule); cairo_private cairo_int_status_t -_cairo_pdf_operators_emit_stroke_style (cairo_pdf_operators_t *pdf_operators, - cairo_stroke_style_t *style, - double scale); +_cairo_pdf_operators_emit_stroke_style (cairo_pdf_operators_t *pdf_operators, + const cairo_stroke_style_t *style, + double scale); cairo_private cairo_int_status_t -_cairo_pdf_operators_stroke (cairo_pdf_operators_t *pdf_operators, +_cairo_pdf_operators_stroke (cairo_pdf_operators_t *pdf_operators, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse); + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse); cairo_private cairo_int_status_t _cairo_pdf_operators_fill (cairo_pdf_operators_t *pdf_operators, @@ -149,12 +149,12 @@ _cairo_pdf_operators_fill (cairo_pdf_operators_t *pdf_operators, cairo_fill_rule_t fill_rule); cairo_private cairo_int_status_t -_cairo_pdf_operators_fill_stroke (cairo_pdf_operators_t *pdf_operators, +_cairo_pdf_operators_fill_stroke (cairo_pdf_operators_t *pdf_operators, cairo_path_fixed_t *path, - cairo_fill_rule_t fill_rule, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse); + cairo_fill_rule_t fill_rule, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse); cairo_private cairo_int_status_t _cairo_pdf_operators_show_text_glyphs (cairo_pdf_operators_t *pdf_operators, diff --git a/src/cairo-pdf-operators.c b/src/cairo-pdf-operators.c index e4a07236..8c3849bc 100644 --- a/src/cairo-pdf-operators.c +++ b/src/cairo-pdf-operators.c @@ -544,9 +544,9 @@ _cairo_pdf_line_join (cairo_line_join_t join) } cairo_int_status_t -_cairo_pdf_operators_emit_stroke_style (cairo_pdf_operators_t *pdf_operators, - cairo_stroke_style_t *style, - double scale) +_cairo_pdf_operators_emit_stroke_style (cairo_pdf_operators_t *pdf_operators, + const cairo_stroke_style_t *style, + double scale) { double *dash = style->dash; int num_dashes = style->num_dashes; @@ -701,12 +701,12 @@ _cairo_matrix_factor_out_scale (cairo_matrix_t *m, double *scale) } static cairo_int_status_t -_cairo_pdf_operators_emit_stroke (cairo_pdf_operators_t *pdf_operators, - cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, - const char *pdf_operator) +_cairo_pdf_operators_emit_stroke (cairo_pdf_operators_t *pdf_operators, + cairo_path_fixed_t *path, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, + const char *pdf_operator) { cairo_status_t status; cairo_matrix_t m, path_transform; @@ -792,11 +792,11 @@ _cairo_pdf_operators_emit_stroke (cairo_pdf_operators_t *pdf_operators, } cairo_int_status_t -_cairo_pdf_operators_stroke (cairo_pdf_operators_t *pdf_operators, - cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse) +_cairo_pdf_operators_stroke (cairo_pdf_operators_t *pdf_operators, + cairo_path_fixed_t *path, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse) { return _cairo_pdf_operators_emit_stroke (pdf_operators, path, @@ -846,12 +846,12 @@ _cairo_pdf_operators_fill (cairo_pdf_operators_t *pdf_operators, } cairo_int_status_t -_cairo_pdf_operators_fill_stroke (cairo_pdf_operators_t *pdf_operators, +_cairo_pdf_operators_fill_stroke (cairo_pdf_operators_t *pdf_operators, cairo_path_fixed_t *path, - cairo_fill_rule_t fill_rule, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse) + cairo_fill_rule_t fill_rule, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse) { const char *operator; diff --git a/src/cairo-pdf-surface-private.h b/src/cairo-pdf-surface-private.h index 5c28f70c..a5096999 100644 --- a/src/cairo-pdf-surface-private.h +++ b/src/cairo-pdf-surface-private.h @@ -95,10 +95,9 @@ typedef enum _cairo_pdf_operation { PDF_SHOW_GLYPHS } cairo_pdf_operation_t; -typedef struct _cairo_pdf_smask_group -{ - double width; - double height; +typedef struct _cairo_pdf_smask_group { + double width; + double height; cairo_pdf_resource_t group_res; cairo_pdf_operation_t operation; cairo_pattern_t *source; @@ -106,10 +105,10 @@ typedef struct _cairo_pdf_smask_group cairo_pattern_t *mask; cairo_path_fixed_t path; cairo_fill_rule_t fill_rule; - cairo_stroke_style_t *style; + cairo_stroke_style_t style; cairo_matrix_t ctm; cairo_matrix_t ctm_inverse; - char *utf8; + char *utf8; int utf8_len; cairo_glyph_t *glyphs; int num_glyphs; diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c index 515e9f6b..46928aa3 100644 --- a/src/cairo-pdf-surface.c +++ b/src/cairo-pdf-surface.c @@ -4889,7 +4889,7 @@ _cairo_pdf_surface_write_smask_group (cairo_pdf_surface_t *surface, case PDF_STROKE: status = _cairo_pdf_operators_stroke (&surface->pdf_operators, &group->path, - group->style, + &group->style, &group->ctm, &group->ctm_inverse); break; @@ -5509,9 +5509,9 @@ _cairo_pdf_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) @@ -5570,7 +5570,7 @@ _cairo_pdf_surface_stroke (void *abstract_surface, return status; } - group->style = style; + group->style = *style; group->ctm = *ctm; group->ctm_inverse = *ctm_inverse; status = _cairo_pdf_surface_add_smask_group (surface, group); @@ -5750,21 +5750,21 @@ _cairo_pdf_surface_fill (void *abstract_surface, } static cairo_int_status_t -_cairo_pdf_surface_fill_stroke (void *abstract_surface, - cairo_operator_t fill_op, - const cairo_pattern_t *fill_source, - cairo_fill_rule_t fill_rule, - double fill_tolerance, - cairo_antialias_t fill_antialias, - cairo_path_fixed_t *path, - cairo_operator_t stroke_op, - const cairo_pattern_t *stroke_source, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *stroke_ctm, - cairo_matrix_t *stroke_ctm_inverse, - double stroke_tolerance, - cairo_antialias_t stroke_antialias, - cairo_clip_t *clip) +_cairo_pdf_surface_fill_stroke (void *abstract_surface, + cairo_operator_t fill_op, + const cairo_pattern_t *fill_source, + cairo_fill_rule_t fill_rule, + double fill_tolerance, + cairo_antialias_t fill_antialias, + cairo_path_fixed_t *path, + cairo_operator_t stroke_op, + const cairo_pattern_t *stroke_source, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *stroke_ctm, + const cairo_matrix_t *stroke_ctm_inverse, + double stroke_tolerance, + cairo_antialias_t stroke_antialias, + cairo_clip_t *clip) { cairo_pdf_surface_t *surface = abstract_surface; cairo_status_t status; diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c index 72dcbd45..d2000ec5 100644 --- a/src/cairo-ps-surface.c +++ b/src/cairo-ps-surface.c @@ -3498,9 +3498,9 @@ _cairo_ps_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) diff --git a/src/cairo-qt-surface.cpp b/src/cairo-qt-surface.cpp index 58d59b52..188b688e 100644 --- a/src/cairo-qt-surface.cpp +++ b/src/cairo-qt-surface.cpp @@ -326,7 +326,7 @@ _qmatrix_from_cairo_matrix (const cairo_matrix_t& m) /** Path conversion **/ typedef struct _qpainter_path_transform { QPainterPath path; - cairo_matrix_t *ctm_inverse; + const cairo_matrix_t *ctm_inverse; } qpainter_path_data; /* cairo path -> execute in context */ @@ -394,7 +394,7 @@ _cairo_path_to_qpainterpath_close_path (void *closure) static inline QPainterPath path_to_qt (cairo_path_fixed_t *path, - cairo_matrix_t *ctm_inverse = NULL) + const cairo_matrix_t *ctm_inverse = NULL) { qpainter_path_data data; cairo_status_t status; @@ -699,7 +699,7 @@ _cairo_qt_surface_get_extents (void *abstract_surface, extents->x = qs->window.x(); extents->y = qs->window.y(); - extents->width = qs->window.width(); + extents->width = qs->window.width(); extents->height = qs->window.height(); return TRUE; @@ -1044,7 +1044,7 @@ struct PatternToBrushConverter { struct PatternToPenConverter { PatternToPenConverter (const cairo_pattern_t *source, - cairo_stroke_style_t *style) : + const cairo_stroke_style_t *style) : mBrushConverter(source) { Qt::PenJoinStyle join = Qt::MiterJoin; @@ -1332,9 +1332,9 @@ _cairo_qt_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c index 78ef3eea..6e86cb26 100644 --- a/src/cairo-quartz-surface.c +++ b/src/cairo-quartz-surface.c @@ -2012,9 +2012,9 @@ _cairo_quartz_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) diff --git a/src/cairo-recording-surface.c b/src/cairo-recording-surface.c index 54260e0f..4c86c5b6 100644 --- a/src/cairo-recording-surface.c +++ b/src/cairo-recording-surface.c @@ -397,9 +397,9 @@ _cairo_recording_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) diff --git a/src/cairo-script-surface.c b/src/cairo-script-surface.c index 8b04c8a5..64526c2d 100644 --- a/src/cairo-script-surface.c +++ b/src/cairo-script-surface.c @@ -2145,9 +2145,9 @@ _cairo_script_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) diff --git a/src/cairo-stroke-style.c b/src/cairo-stroke-style.c index eac69dbb..6ef85f4b 100644 --- a/src/cairo-stroke-style.c +++ b/src/cairo-stroke-style.c @@ -53,7 +53,7 @@ _cairo_stroke_style_init (cairo_stroke_style_t *style) cairo_status_t _cairo_stroke_style_init_copy (cairo_stroke_style_t *style, - cairo_stroke_style_t *other) + const cairo_stroke_style_t *other) { if (CAIRO_INJECT_FAULT ()) return _cairo_error (CAIRO_STATUS_NO_MEMORY); diff --git a/src/cairo-surface-fallback-private.h b/src/cairo-surface-fallback-private.h index c63c36e7..2dc2e979 100644 --- a/src/cairo-surface-fallback-private.h +++ b/src/cairo-surface-fallback-private.h @@ -59,9 +59,9 @@ _cairo_surface_fallback_stroke (cairo_surface_t *surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip); diff --git a/src/cairo-surface-fallback.c b/src/cairo-surface-fallback.c index c9f9a01c..dbc2a217 100644 --- a/src/cairo-surface-fallback.c +++ b/src/cairo-surface-fallback.c @@ -1149,9 +1149,9 @@ _cairo_surface_fallback_stroke (cairo_surface_t *surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) diff --git a/src/cairo-surface-wrapper-private.h b/src/cairo-surface-wrapper-private.h index 7da4cdaa..a9933486 100644 --- a/src/cairo-surface-wrapper-private.h +++ b/src/cairo-surface-wrapper-private.h @@ -85,9 +85,9 @@ _cairo_surface_wrapper_stroke (cairo_surface_wrapper_t *wrapper, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip); @@ -102,9 +102,9 @@ _cairo_surface_wrapper_fill_stroke (cairo_surface_wrapper_t *wrapper, cairo_path_fixed_t *path, cairo_operator_t stroke_op, const cairo_pattern_t *stroke_source, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *stroke_ctm, - cairo_matrix_t *stroke_ctm_inverse, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *stroke_ctm, + const cairo_matrix_t *stroke_ctm_inverse, double stroke_tolerance, cairo_antialias_t stroke_antialias, cairo_clip_t *clip); diff --git a/src/cairo-surface-wrapper.c b/src/cairo-surface-wrapper.c index d03c2030..468a8d0e 100644 --- a/src/cairo-surface-wrapper.c +++ b/src/cairo-surface-wrapper.c @@ -193,9 +193,9 @@ _cairo_surface_wrapper_stroke (cairo_surface_wrapper_t *wrapper, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) @@ -273,9 +273,9 @@ _cairo_surface_wrapper_fill_stroke (cairo_surface_wrapper_t *wrapper, cairo_path_fixed_t *path, cairo_operator_t stroke_op, const cairo_pattern_t *stroke_source, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *stroke_ctm, - cairo_matrix_t *stroke_ctm_inverse, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *stroke_ctm, + const cairo_matrix_t *stroke_ctm_inverse, double stroke_tolerance, cairo_antialias_t stroke_antialias, cairo_clip_t *clip) diff --git a/src/cairo-surface.c b/src/cairo-surface.c index 5753277e..dee6207e 100644 --- a/src/cairo-surface.c +++ b/src/cairo-surface.c @@ -2004,9 +2004,9 @@ _cairo_surface_fill_stroke (cairo_surface_t *surface, cairo_path_fixed_t *path, cairo_operator_t stroke_op, const cairo_pattern_t *stroke_source, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *stroke_ctm, - cairo_matrix_t *stroke_ctm_inverse, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *stroke_ctm, + const cairo_matrix_t *stroke_ctm_inverse, double stroke_tolerance, cairo_antialias_t stroke_antialias, cairo_clip_t *clip) @@ -2071,9 +2071,9 @@ _cairo_surface_stroke (cairo_surface_t *surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) @@ -2908,7 +2908,7 @@ _cairo_surface_stroke_extents (cairo_surface_t *surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, + const cairo_stroke_style_t *style, const cairo_matrix_t *ctm, const cairo_matrix_t *ctm_inverse, double tolerance, diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c index 88765f30..da6bc602 100644 --- a/src/cairo-svg-surface.c +++ b/src/cairo-svg-surface.c @@ -66,9 +66,9 @@ static const cairo_svg_version_t _cairo_svg_versions[] = #define CAIRO_SVG_VERSION_LAST ARRAY_LENGTH (_cairo_svg_versions) static void -_cairo_svg_surface_emit_path (cairo_output_stream_t *output, - cairo_path_fixed_t *path, - cairo_matrix_t *ctm_inverse); +_cairo_svg_surface_emit_path (cairo_output_stream_t *output, + cairo_path_fixed_t *path, + const cairo_matrix_t *ctm_inverse); static cairo_bool_t _cairo_svg_version_has_page_set_support (cairo_svg_version_t version) @@ -590,7 +590,7 @@ _cairo_svg_surface_emit_transform (cairo_output_stream_t *output, typedef struct { cairo_output_stream_t *output; - cairo_matrix_t *ctm_inverse; + const cairo_matrix_t *ctm_inverse; } svg_path_info_t; static cairo_status_t @@ -663,9 +663,9 @@ _cairo_svg_path_close_path (void *closure) } static void -_cairo_svg_surface_emit_path (cairo_output_stream_t *output, - cairo_path_fixed_t *path, - cairo_matrix_t *ctm_inverse) +_cairo_svg_surface_emit_path (cairo_output_stream_t *output, + cairo_path_fixed_t *path, + const cairo_matrix_t *ctm_inverse) { cairo_status_t status; svg_path_info_t info; @@ -1948,7 +1948,7 @@ _cairo_svg_surface_emit_fill_style (cairo_output_stream_t *output, cairo_operator_t op, const cairo_pattern_t *source, cairo_fill_rule_t fill_rule, - cairo_matrix_t *parent_matrix) + const cairo_matrix_t *parent_matrix) { _cairo_output_stream_printf (output, "fill-rule:%s;", @@ -1959,12 +1959,12 @@ _cairo_svg_surface_emit_fill_style (cairo_output_stream_t *output, } static cairo_status_t -_cairo_svg_surface_emit_stroke_style (cairo_output_stream_t *output, - cairo_svg_surface_t *surface, - cairo_operator_t op, - const cairo_pattern_t *source, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *parent_matrix) +_cairo_svg_surface_emit_stroke_style (cairo_output_stream_t *output, + cairo_svg_surface_t *surface, + cairo_operator_t op, + const cairo_pattern_t *source, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *parent_matrix) { cairo_status_t status; const char *line_cap, *line_join; @@ -2046,9 +2046,9 @@ _cairo_svg_surface_fill_stroke (void *abstract_surface, cairo_path_fixed_t *path, cairo_operator_t stroke_op, const cairo_pattern_t *stroke_source, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *stroke_ctm, - cairo_matrix_t *stroke_ctm_inverse, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *stroke_ctm, + const cairo_matrix_t *stroke_ctm_inverse, double stroke_tolerance, cairo_antialias_t stroke_antialias, cairo_clip_t *clip) @@ -2337,9 +2337,9 @@ _cairo_svg_surface_stroke (void *abstract_dst, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) diff --git a/src/cairo-tee-surface.c b/src/cairo-tee-surface.c index 76f4b9db..5cc6f5e9 100644 --- a/src/cairo-tee-surface.c +++ b/src/cairo-tee-surface.c @@ -252,9 +252,9 @@ _cairo_tee_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) diff --git a/src/cairo-type3-glyph-surface.c b/src/cairo-type3-glyph-surface.c index 60698d4c..8df6ef80 100644 --- a/src/cairo-type3-glyph-surface.c +++ b/src/cairo-type3-glyph-surface.c @@ -233,9 +233,9 @@ _cairo_type3_glyph_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) diff --git a/src/cairo-win32-printing-surface.c b/src/cairo-win32-printing-surface.c index aff71ec0..8eae55da 100644 --- a/src/cairo-win32-printing-surface.c +++ b/src/cairo-win32-printing-surface.c @@ -1246,9 +1246,9 @@ _cairo_win32_printing_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *stroke_ctm, - cairo_matrix_t *stroke_ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *stroke_ctm, + const cairo_matrix_t *stroke_ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) diff --git a/src/cairo-xml-surface.c b/src/cairo-xml-surface.c index f32ea9d6..d7d9b569 100644 --- a/src/cairo-xml-surface.c +++ b/src/cairo-xml-surface.c @@ -756,9 +756,9 @@ _cairo_xml_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) diff --git a/src/cairoint.h b/src/cairoint.h index a2243478..d8ed782f 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -780,9 +780,9 @@ struct _cairo_surface_backend { cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip); @@ -825,9 +825,9 @@ struct _cairo_surface_backend { cairo_path_fixed_t *path, cairo_operator_t stroke_op, const cairo_pattern_t *stroke_source, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *stroke_ctm, - cairo_matrix_t *stroke_ctm_inverse, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *stroke_ctm, + const cairo_matrix_t *stroke_ctm_inverse, double stroke_tolerance, cairo_antialias_t stroke_antialias, cairo_clip_t *clip); @@ -1522,13 +1522,13 @@ _cairo_path_fixed_fill_extents (const cairo_path_fixed_t *path, cairo_private void _cairo_path_fixed_approximate_stroke_extents (const cairo_path_fixed_t *path, - cairo_stroke_style_t *style, + const cairo_stroke_style_t *style, const cairo_matrix_t *ctm, cairo_rectangle_int_t *extents); cairo_private cairo_status_t _cairo_path_fixed_stroke_extents (const cairo_path_fixed_t *path, - cairo_stroke_style_t *style, + const cairo_stroke_style_t *style, const cairo_matrix_t *ctm, const cairo_matrix_t *ctm_inverse, double tolerance, @@ -1584,7 +1584,7 @@ _cairo_path_fixed_fill_to_traps (const cairo_path_fixed_t *path, /* cairo-path-stroke.c */ cairo_private cairo_status_t _cairo_path_fixed_stroke_to_polygon (const cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, + const cairo_stroke_style_t *stroke_style, const cairo_matrix_t *ctm, const cairo_matrix_t *ctm_inverse, double tolerance, @@ -1592,12 +1592,12 @@ _cairo_path_fixed_stroke_to_polygon (const cairo_path_fixed_t *path, cairo_private cairo_int_status_t _cairo_path_fixed_stroke_rectilinear_to_traps (const cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, + const cairo_stroke_style_t *stroke_style, const cairo_matrix_t *ctm, cairo_traps_t *traps); cairo_private cairo_status_t _cairo_path_fixed_stroke_to_traps (const cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, + const cairo_stroke_style_t *stroke_style, const cairo_matrix_t *ctm, const cairo_matrix_t *ctm_inverse, double tolerance, @@ -1605,9 +1605,9 @@ _cairo_path_fixed_stroke_to_traps (const cairo_path_fixed_t *path, cairo_private cairo_status_t _cairo_path_fixed_stroke_to_shaper (cairo_path_fixed_t *path, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_status_t (*add_triangle) (void *closure, const cairo_point_t triangle[3]), @@ -1739,7 +1739,7 @@ _cairo_stroke_style_init (cairo_stroke_style_t *style); cairo_private cairo_status_t _cairo_stroke_style_init_copy (cairo_stroke_style_t *style, - cairo_stroke_style_t *other); + const cairo_stroke_style_t *other); cairo_private void _cairo_stroke_style_fini (cairo_stroke_style_t *style); @@ -1879,9 +1879,9 @@ _cairo_surface_fill_stroke (cairo_surface_t *surface, cairo_path_fixed_t *path, cairo_operator_t stroke_op, const cairo_pattern_t *stroke_source, - cairo_stroke_style_t *stroke_style, - cairo_matrix_t *stroke_ctm, - cairo_matrix_t *stroke_ctm_inverse, + const cairo_stroke_style_t *stroke_style, + const cairo_matrix_t *stroke_ctm, + const cairo_matrix_t *stroke_ctm_inverse, double stroke_tolerance, cairo_antialias_t stroke_antialias, cairo_clip_t *clip); @@ -1891,9 +1891,9 @@ _cairo_surface_stroke (cairo_surface_t *surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip); @@ -1942,7 +1942,7 @@ _cairo_surface_stroke_extents (cairo_surface_t *surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, + const cairo_stroke_style_t *style, const cairo_matrix_t *ctm, const cairo_matrix_t *ctm_inverse, double tolerance, diff --git a/src/drm/cairo-drm-private.h b/src/drm/cairo-drm-private.h index 4a32c68a..0f1b735f 100644 --- a/src/drm/cairo-drm-private.h +++ b/src/drm/cairo-drm-private.h @@ -198,9 +198,9 @@ _cairo_drm_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip); diff --git a/src/drm/cairo-drm-surface.c b/src/drm/cairo-drm-surface.c index a8f9ab15..429b528d 100644 --- a/src/drm/cairo-drm-surface.c +++ b/src/drm/cairo-drm-surface.c @@ -143,9 +143,9 @@ _cairo_drm_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) diff --git a/src/test-null-surface.c b/src/test-null-surface.c index 5a260bbb..44a284ec 100644 --- a/src/test-null-surface.c +++ b/src/test-null-surface.c @@ -69,9 +69,9 @@ typedef cairo_int_status_t cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip); diff --git a/src/test-paginated-surface.c b/src/test-paginated-surface.c index 62e5cb6b..73b66172 100644 --- a/src/test-paginated-surface.c +++ b/src/test-paginated-surface.c @@ -150,9 +150,9 @@ _test_paginated_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) diff --git a/src/test-wrapping-surface.c b/src/test-wrapping-surface.c index d76218f8..3c14cc80 100644 --- a/src/test-wrapping-surface.c +++ b/src/test-wrapping-surface.c @@ -161,9 +161,9 @@ _test_wrapping_surface_stroke (void *abstract_surface, cairo_operator_t op, const cairo_pattern_t *source, cairo_path_fixed_t *path, - cairo_stroke_style_t *style, - cairo_matrix_t *ctm, - cairo_matrix_t *ctm_inverse, + const cairo_stroke_style_t *style, + const cairo_matrix_t *ctm, + const cairo_matrix_t *ctm_inverse, double tolerance, cairo_antialias_t antialias, cairo_clip_t *clip) |