[cairo-commit] libpixman/src icimage.c,1.20,1.21

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/libpixman/src
In directory gabe:/tmp/cvs-serv6116/src

Modified Files:
	icimage.c 
Log Message:
Fixed clipping

Index: icimage.c
===================================================================
RCS file: /cvs/cairo/libpixman/src/icimage.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** icimage.c	6 May 2004 12:50:23 -0000	1.20
--- icimage.c	12 Sep 2004 02:42:40 -0000	1.21
***************
*** 265,269 ****
      pixman_image_destroyClip (image);
      if (region) {
! 	image->clientClip = region;
  	image->clientClipType = CT_REGION;
      }
--- 265,270 ----
      pixman_image_destroyClip (image);
      if (region) {
! 	image->clientClip = pixman_region_create ();
! 	pixman_region_copy (image->clientClip, region);
  	image->clientClipType = CT_REGION;
      }
***************
*** 614,617 ****
--- 615,625 ----
  	}
      }
+     if (iDst->clientClipType != CT_NONE) {
+ 	if (!IcClipImageReg (region, iDst->clientClip, 0, 0))
+         {
+ 	    pixman_region_destroy (region);
+ 	    return 0;
+         }
+     }
      return 1;
  }