fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-06 11:38:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[fixpt] Fix up compilation post pixman merge

Browse source
This commit is contained in:
Vladimir Vukicevic 2007-07-04 12:16:27 +02:00 • committed by Vladimir Vukicevic
parent 866b485314
commit b719592428
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cairo-pattern.c
View file

@ -1170,7 +1170,6 @@ _cairo_pattern_acquire_surface_for_gradient (cairo_gradient_pattern_t *pattern,
{
cairo_linear_pattern_t *linear = (cairo_linear_pattern_t *) pattern;
pixman_point_fixed_t p1, p2;
pixman_linear_gradient_t gradient;
p1.x = _cairo_fixed_to_16_16 (linear->p1.x);
p1.y = _cairo_fixed_to_16_16 (linear->p1.y);

2
src/cairo-region-private.h
View file

@ -37,7 +37,7 @@
#ifndef CAIRO_REGION_PRIVATE_H
#define CAIRO_REGION_PRIVATE_H
#include <pixman.h>
#include <pixman/pixman.h>
/* cairo_region_t is defined in cairoint.h */

9
src/cairo-region.c
View file

@ -77,7 +77,7 @@ _cairo_region_init_boxes (cairo_region_t *region,
pboxes[i].y2 = boxes[i].p2.y;
}
if (!pixman_region_init_rects (region, pboxes, count))
if (!pixman_region_init_rects (&region->rgn, pboxes, count))
status = CAIRO_STATUS_NO_MEMORY;
if (pboxes != stack_pboxes)
@ -104,24 +104,25 @@ _cairo_region_copy (cairo_region_t *dst, cairo_region_t *src)
int
_cairo_region_num_boxes (cairo_region_t *region)
{
return pixman_region_n_rects(&region->rgn);
return pixman_region_n_rects (&region->rgn);
}
cairo_int_status_t
_cairo_region_get_boxes (cairo_region_t *region, int *num_boxes, cairo_box_int_t **boxes)
{
int nboxes = pixman_region_n_rects (&region->rgn);
int nboxes;
pixman_box16_t *pboxes;
cairo_box_int_t *cboxes;
int i;
pboxes = pixman_region_rectangles (&region->rgn, &nboxes);
if (nboxes == 0) {
*num_boxes = 0;
*boxes = NULL;
return CAIRO_STATUS_SUCCESS;
}
pboxes = pixman_region_rectangles (&region->rgn);
cboxes = _cairo_malloc_ab (nboxes, sizeof(cairo_box_int_t));
if (cboxes == NULL)
return CAIRO_STATUS_NO_MEMORY;

6
src/cairo-svg-surface.c
View file

@ -1429,12 +1429,12 @@ _cairo_svg_surface_emit_radial_pattern (cairo_svg_surface_t *surface,
double fx, fy;
cairo_bool_t reverse_stops;
cairo_status_t status;
cairo_point_t &c0, &c1;
cairo_point_t *c0, *c1;
cairo_fixed_t radius0, radius1;
extend = pattern->base.base.extend;
if (pattern->radius1 < pattern->radius2) {
if (pattern->r1 < pattern->r2) {
c0 = &pattern->c1;
c1 = &pattern->c2;
radius0 = pattern->r1;
@ -1460,7 +1460,7 @@ _cairo_svg_surface_emit_radial_pattern (cairo_svg_surface_t *surface,
if (status)
return status;
if (radius0 == radius1) {
if (pattern->r1 == pattern->r2) {
_cairo_output_stream_printf (document->xml_node_defs,
"<radialGradient id=\"radial%d\" "
"gradientUnits=\"userSpaceOnUse\" "