Skip to content

Commit

Permalink
quartz: Cleanup gradient setup functions
Browse files Browse the repository at this point in the history
Gradient setup does not depend anymore on the surface on which the
gradient will be composited.
  • Loading branch information
Andrea Canciani committed Oct 12, 2010
1 parent 1061c80 commit ce45599
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions src/cairo-quartz-surface.c
Original file line number Diff line number Diff line change
Expand Up @@ -887,8 +887,7 @@ UpdateLinearParametersToIncludePoint (double *min_t, double *max_t, CGPoint *sta
}

static CGFunctionRef
CreateRepeatingLinearGradientFunction (cairo_quartz_surface_t *surface,
const cairo_gradient_pattern_t *gpat,
CreateRepeatingLinearGradientFunction (const cairo_gradient_pattern_t *gpat,
CGPoint *start, CGPoint *end,
const cairo_rectangle_int_t *extents)
{
Expand Down Expand Up @@ -987,8 +986,7 @@ UpdateRadialParameterToIncludePoint (double *max_t, CGPoint *center,

/* This must only be called when one of the circles properly contains the other */
static CGFunctionRef
CreateRepeatingRadialGradientFunction (cairo_quartz_surface_t *surface,
const cairo_gradient_pattern_t *gpat,
CreateRepeatingRadialGradientFunction (const cairo_gradient_pattern_t *gpat,
CGPoint *start, double *start_radius,
CGPoint *end, double *end_radius,
const cairo_rectangle_int_t *extents)
Expand Down Expand Up @@ -1336,7 +1334,6 @@ clip region).
*/
static cairo_int_status_t
_cairo_quartz_setup_linear_source (cairo_quartz_drawing_state_t *state,
cairo_quartz_surface_t *surface,
const cairo_linear_pattern_t *lpat,
const cairo_rectangle_int_t *extents)
{
Expand All @@ -1363,8 +1360,7 @@ _cairo_quartz_setup_linear_source (cairo_quartz_drawing_state_t *state,
if (!extend)
gradFunc = CreateGradientFunction (&lpat->base);
else
gradFunc = CreateRepeatingLinearGradientFunction (surface,
&lpat->base,
gradFunc = CreateRepeatingLinearGradientFunction (&lpat->base,
&start, &end,
extents);

Expand All @@ -1382,7 +1378,6 @@ _cairo_quartz_setup_linear_source (cairo_quartz_drawing_state_t *state,

static cairo_int_status_t
_cairo_quartz_setup_radial_source (cairo_quartz_drawing_state_t *state,
cairo_quartz_surface_t *surface,
const cairo_radial_pattern_t *rpat,
const cairo_rectangle_int_t *extents)
{
Expand Down Expand Up @@ -1413,8 +1408,7 @@ _cairo_quartz_setup_radial_source (cairo_quartz_drawing_state_t *state,
if (!extend)
gradFunc = CreateGradientFunction (&rpat->base);
else
gradFunc = CreateRepeatingRadialGradientFunction (surface,
&rpat->base,
gradFunc = CreateRepeatingRadialGradientFunction (&rpat->base,
&start, &r1,
&end, &r2,
extents);
Expand Down Expand Up @@ -1480,12 +1474,12 @@ _cairo_quartz_setup_source (cairo_quartz_drawing_state_t *state,

if (source->type == CAIRO_PATTERN_TYPE_LINEAR) {
const cairo_linear_pattern_t *lpat = (const cairo_linear_pattern_t *)source;
return _cairo_quartz_setup_linear_source (state, surface, lpat, extents);
return _cairo_quartz_setup_linear_source (state, lpat, extents);
}

if (source->type == CAIRO_PATTERN_TYPE_RADIAL) {
const cairo_radial_pattern_t *rpat = (const cairo_radial_pattern_t *)source;
return _cairo_quartz_setup_radial_source (state, surface, rpat, extents);
return _cairo_quartz_setup_radial_source (state, rpat, extents);
}

if (source->type == CAIRO_PATTERN_TYPE_SURFACE &&
Expand Down

0 comments on commit ce45599

Please sign in to comment.