diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-15 08:09:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-15 08:09:08 +0000 |
| commit | c915fe74ff1b1d02f7506a187bc9b588f5c21f97 (patch) | |
| tree | 7ecc8f8867bac10fcfc1299469333178f7cf5838 /xorg-server/fb/fbtrap.c | |
| parent | 0925cb4f76a1667fb3777efbe6a0e0e69c4cca3c (diff) | |
| parent | 9b17452909d3140fa33a753cadfaa6e9006b9685 (diff) | |
| download | vcxsrv-c915fe74ff1b1d02f7506a187bc9b588f5c21f97.tar.gz vcxsrv-c915fe74ff1b1d02f7506a187bc9b588f5c21f97.tar.bz2 vcxsrv-c915fe74ff1b1d02f7506a187bc9b588f5c21f97.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/fb/fbtrap.c')
| -rw-r--r-- | xorg-server/fb/fbtrap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/fb/fbtrap.c b/xorg-server/fb/fbtrap.c index b1e1eff4a..515e2e1c1 100644 --- a/xorg-server/fb/fbtrap.c +++ b/xorg-server/fb/fbtrap.c @@ -40,7 +40,8 @@ fbAddTraps (PicturePtr pPicture, int ntrap, xTrap *traps) { - pixman_image_t *image = image_from_pict (pPicture, FALSE, FALSE); + int image_xoff, image_yoff; + pixman_image_t *image = image_from_pict (pPicture, FALSE, &image_xoff, &image_yoff); if (!image) return; @@ -56,7 +57,8 @@ fbRasterizeTrapezoid (PicturePtr pPicture, int x_off, int y_off) { - pixman_image_t *image = image_from_pict (pPicture, FALSE, FALSE); + int mask_xoff, mask_yoff; + pixman_image_t *image = image_from_pict (pPicture, FALSE, &mask_xoff, &mask_yoff); if (!image) return; |