[cairo-commit] libpixman/src ictri.c,1.9,1.10
Dave Beckett
commit at pdx.freedesktop.org
Wed Dec 10 15:24:14 PST 2003
Committed by: dajobe
Update of /cvs/cairo/libpixman/src
In directory pdx:/tmp/cvs-serv13325
Modified Files:
ictri.c
Log Message:
Correct over-eager renames of the form pixman_thing_tName into
pixman_thing_name. It was inevitable really this would happen!
Index: ictri.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/ictri.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ictri.c 10 Dec 2003 22:21:42 -0000 1.9
--- ictri.c 10 Dec 2003 23:24:12 -0000 1.10
***************
*** 24,28 ****
static void
! pixman_point_fixed_tBounds (int npoint, const pixman_point_fixed_t *points, pixman_box16_t *bounds)
{
bounds->x1 = xFixedToInt (points->x);
--- 24,28 ----
static void
! pixman_point_fixed_bounds (int npoint, const pixman_point_fixed_t *points, pixman_box16_t *bounds)
{
bounds->x1 = xFixedToInt (points->x);
***************
*** 52,58 ****
static void
! pixman_triangle_tBounds (int ntri, const pixman_triangle_t *tris, pixman_box16_t *bounds)
{
! pixman_point_fixed_tBounds (ntri * 3, (pixman_point_fixed_t *) tris, bounds);
}
--- 52,58 ----
static void
! pixman_triangle_bounds (int ntri, const pixman_triangle_t *tris, pixman_box16_t *bounds)
{
! pixman_point_fixed_bounds (ntri * 3, (pixman_point_fixed_t *) tris, bounds);
}
***************
*** 153,161 ****
yDst = tris[0].p1.y >> 16;
! format = pixman_format_tCreate (PIXMAN_FORMAT_NAME_A8);
if (format)
{
! pixman_triangle_tBounds (ntris, tris, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
return;
--- 153,161 ----
yDst = tris[0].p1.y >> 16;
! format = pixman_format_create (PIXMAN_FORMAT_NAME_A8);
if (format)
{
! pixman_triangle_bounds (ntris, tris, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
return;
***************
*** 171,175 ****
if (!format)
{
! pixman_triangle_tBounds (1, tris, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
continue;
--- 171,175 ----
if (!format)
{
! pixman_triangle_bounds (1, tris, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
continue;
***************
*** 189,193 ****
xRel, yRel, 0, 0, bounds.x1, bounds.y1,
bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
! pixman_image_tDestroy (image);
}
/* XXX adjust xSrc and ySrc */
--- 189,193 ----
xRel, yRel, 0, 0, bounds.x1, bounds.y1,
bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
! pixman_image_destroy (image);
}
/* XXX adjust xSrc and ySrc */
***************
*** 200,207 ****
xRel, yRel, 0, 0, bounds.x1, bounds.y1,
bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
! pixman_image_tDestroy (image);
}
! pixman_format_tDestroy (format);
}
--- 200,207 ----
xRel, yRel, 0, 0, bounds.x1, bounds.y1,
bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
! pixman_image_destroy (image);
}
! pixman_format_destroy (format);
}
***************
*** 225,229 ****
yDst = points[0].y >> 16;
! format = pixman_format_tCreate (PIXMAN_FORMAT_NAME_A8);
if (npoints < 3)
--- 225,229 ----
yDst = points[0].y >> 16;
! format = pixman_format_create (PIXMAN_FORMAT_NAME_A8);
if (npoints < 3)
***************
*** 231,235 ****
if (format)
{
! pixman_point_fixed_tBounds (npoints, points, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
return;
--- 231,235 ----
if (format)
{
! pixman_point_fixed_bounds (npoints, points, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
return;
***************
*** 248,252 ****
if (!format)
{
! pixman_triangle_tBounds (1, &tri, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
continue;
--- 248,252 ----
if (!format)
{
! pixman_triangle_bounds (1, &tri, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
continue;
***************
*** 266,270 ****
xRel, yRel, 0, 0, bounds.x1, bounds.y1,
bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
! pixman_image_tDestroy (image);
}
}
--- 266,270 ----
xRel, yRel, 0, 0, bounds.x1, bounds.y1,
bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
! pixman_image_destroy (image);
}
}
***************
*** 276,283 ****
xRel, yRel, 0, 0, bounds.x1, bounds.y1,
bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
! pixman_image_tDestroy (image);
}
! pixman_format_tDestroy (format);
}
--- 276,283 ----
xRel, yRel, 0, 0, bounds.x1, bounds.y1,
bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
! pixman_image_destroy (image);
}
! pixman_format_destroy (format);
}
***************
*** 302,306 ****
yDst = points[0].y >> 16;
! format = pixman_format_tCreate (PIXMAN_FORMAT_NAME_A8);
if (npoints < 3)
--- 302,306 ----
yDst = points[0].y >> 16;
! format = pixman_format_create (PIXMAN_FORMAT_NAME_A8);
if (npoints < 3)
***************
*** 308,312 ****
if (format)
{
! pixman_point_fixed_tBounds (npoints, points, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
return;
--- 308,312 ----
if (format)
{
! pixman_point_fixed_bounds (npoints, points, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
return;
***************
*** 327,331 ****
if (!format)
{
! pixman_triangle_tBounds (1, &tri, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
continue;
--- 327,331 ----
if (!format)
{
! pixman_triangle_bounds (1, &tri, &bounds);
if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
continue;
***************
*** 345,349 ****
xRel, yRel, 0, 0, bounds.x1, bounds.y1,
bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
! pixman_image_tDestroy (image);
}
}
--- 345,349 ----
xRel, yRel, 0, 0, bounds.x1, bounds.y1,
bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
! pixman_image_destroy (image);
}
}
***************
*** 355,362 ****
xRel, yRel, 0, 0, bounds.x1, bounds.y1,
bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
! pixman_image_tDestroy (image);
}
! pixman_format_tDestroy (format);
}
--- 355,362 ----
xRel, yRel, 0, 0, bounds.x1, bounds.y1,
bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
! pixman_image_destroy (image);
}
! pixman_format_destroy (format);
}
More information about the cairo-commit
mailing list