summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@redhat.com>2007-08-23 12:15:03 -0400
committerSøren Sandmann Pedersen <sandmann@redhat.com>2007-08-23 12:15:03 -0400
commit943dd6ad99670c283a6869ea6c5f751acbd73134 (patch)
treeadad994ae98c4e4e965e4dd8b005dcdf61b284fb
parent13949f997289068354e83bc83e50d97b8232efb1 (diff)
Revert "Revert "Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix"" since the pixman changes have been pushed now.
-rw-r--r--configure.ac2
-rw-r--r--fb/fbpict.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index f0ede7589..fae439cb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -624,7 +624,7 @@ XEXT_INC='-I$(top_srcdir)/Xext'
XEXT_LIB='$(top_builddir)/Xext/libXext.la'
XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
-PIXMAN="[pixman-1 >= 0.9.4]"
+PIXMAN="[pixman-1 >= 0.9.5]"
PKG_CHECK_MODULES(PIXMAN, $PIXMAN)
AC_SUBST(PIXMAN_CFLAGS)
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 8a146ddaa..85b5171c5 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -397,6 +397,7 @@ set_image_properties (pixman_image_t *image, PicturePtr pict)
}
pixman_image_set_filter (image, filter, (pixman_fixed_t *)pict->filter_params, pict->filter_nparams);
+ pixman_image_set_source_clipping (image, TRUE);
}
pixman_image_t *