pixman: Changes to 'upstream-experimental'

[Julien Cristau <jcristau@alioth.debian.org>]

 pixman/pixman-image.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5ca61dc99b198243f08e6f1f3f96e3c87ff818b9
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date:   Tue Jun 5 11:33:17 2007 -0400

    Fix bug in pixman_image_set_filter() where only the parameters were
    updated, not the filter type. Reported by Michel Dänzer.

diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c
index 0802b86..e7e5d24 100644
--- a/pixman/pixman-image.c
+++ b/pixman/pixman-image.c
@@ -351,8 +351,10 @@ pixman_image_set_filter (pixman_image_t       *image,
 {
     image_common_t *common = (image_common_t *)image;
     
-    if (params != common->filter_params)
+    if (params != common->filter_params || filter != common->filter)
     {
+	common->filter = filter;
+	
 	if (common->filter_params)
 	    free (common->filter_params);