fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-30 23:20:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

quartz: Fix EXTEND_PAD gradients

Browse source 
Make PAD extended gardients more robust, by computing the color
explicitly like for REPEAT and REFLECT extend modes.
This removes a hack introducing a small but non-0 negative value
that ensured that the gradient started with the correct color (but
not that it ended with the correct one, too).

Fixes linear-gradient-large.
This commit is contained in:
Andrea Canciani 2010-09-07 08:49:05 +02:00
parent 2af3ae92eb
commit 620c43f50c
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/cairo-quartz-surface.c
View file

@ -832,7 +832,7 @@ static const CGFunctionCallbacks gradient_callbacks = {
function into an array of fixed size, so if the input range is larger
than needed, the resolution of the gradient will be unnecessarily low.
*/
static const cairo_quartz_float_t nonrepeating_gradient_input_value_range[2] = { -0.001f, 1.f };
static const cairo_quartz_float_t nonrepeating_gradient_input_value_range[2] = { 0., 1. };
static CGFunctionRef
CreateGradientFunction (const cairo_gradient_pattern_t *gpat)
@ -1346,7 +1346,7 @@ _cairo_quartz_setup_linear_source (cairo_quartz_surface_t *surface,
CGPoint start, end;
CGFunctionRef gradFunc;
CGColorSpaceRef rgb;
bool extend = abspat->extend == CAIRO_EXTEND_PAD;
bool extend = abspat->extend != CAIRO_EXTEND_NONE;
assert (lpat->base.n_stops > 0);
@ -1361,16 +1361,13 @@ _cairo_quartz_setup_linear_source (cairo_quartz_surface_t *surface,
end = CGPointMake (_cairo_fixed_to_double (lpat->p2.x),
_cairo_fixed_to_double (lpat->p2.y));
if (abspat->extend == CAIRO_EXTEND_NONE ||
abspat->extend == CAIRO_EXTEND_PAD)
{
if (!extend)
gradFunc = CreateGradientFunction (&lpat->base);
} else {
else
gradFunc = CreateRepeatingLinearGradientFunction (surface,
&lpat->base,
&start, &end,
extents);
}
surface->sourceShading = CGShadingCreateAxial (rgb,
start, end,
@ -1393,7 +1390,7 @@ _cairo_quartz_setup_radial_source (cairo_quartz_surface_t *surface,
CGPoint start, end;
CGFunctionRef gradFunc;
CGColorSpaceRef rgb;
bool extend = abspat->extend == CAIRO_EXTEND_PAD;
bool extend = abspat->extend != CAIRO_EXTEND_NONE;
double c1x = _cairo_fixed_to_double (rpat->c1.x);
double c1y = _cairo_fixed_to_double (rpat->c1.y);
double c2x = _cairo_fixed_to_double (rpat->c2.x);
@ -1412,17 +1409,14 @@ _cairo_quartz_setup_radial_source (cairo_quartz_surface_t *surface,
start = CGPointMake (c1x, c1y);
end = CGPointMake (c2x, c2y);
if (abspat->extend == CAIRO_EXTEND_NONE ||
abspat->extend == CAIRO_EXTEND_PAD)
{
if (!extend)
gradFunc = CreateGradientFunction (&rpat->base);
} else {
else
gradFunc = CreateRepeatingRadialGradientFunction (surface,
&rpat->base,
&start, &r1,
&end, &r2,
extents);
}
surface->sourceShading = CGShadingCreateRadial (rgb,
start,