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

Merge in changes from xserver, (mostly just whitespace).

Browse source
This commit is contained in:
Carl Worth 2005-01-21 09:26:44 +00:00
parent d466c33d1d
commit c64e2ccd06
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pixman/ChangeLog
View file

@ -1,3 +1,8 @@
2005-01-21 Carl Worth <cworth@cworth.org>
* src/fbtrap.c: Merge in changes from xserver, (mostly just
whitespace).
2005-01-18 Carl Worth <cworth@cworth.org>
* src/fbedge.c:

21
pixman/src/fbtrap.c
View file

@ -1,5 +1,5 @@
/*
* $Id: fbtrap.c,v 1.1 2005-01-18 19:54:23 cworth Exp $
* $Id: fbtrap.c,v 1.2 2005-01-21 17:26:44 cworth Exp $
*
* Copyright © 2004 Keith Packard
*
@ -22,6 +22,9 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "fb.h"
#ifdef RENDER
@ -95,7 +98,7 @@ fbAddTraps (PicturePtr pPicture,
void
fbRasterizeTrapezoid (PicturePtr pPicture,
xTrapezoid *trap,
xTrapezoid *trap,
int x_off,
int y_off)
{
@ -171,9 +174,9 @@ fbAddTriangles (PicturePtr pPicture,
INT16 x_off,
INT16 y_off,
int ntri,
xTriangle *tris)
xTriangle *tris)
{
xPointFixed *top, *left, *right, *tmp;
xPointFixed *top, *left, *right, *tmp;
xTrapezoid trap;
for (; ntri; ntri--, tris++)
@ -194,14 +197,14 @@ fbAddTriangles (PicturePtr pPicture,
/*
* Two cases:
*
* + +
* / \ / \
* / \ / \
* / + + \
* + +
* / \ / \
* / \ / \
* / + + \
* / -- -- \
* / -- -- \
* / --- --- \
* +-- --+
* +-- --+
*/
trap.top = top->y;