[cairo-commit] cairo/src cairo_xlib_surface.c,1.15,1.16

[Graydon Hoare]

Committed by: graydon

Update of /cvs/cairo/cairo/src
In directory pdx:/tmp/cvs-serv23687/src

Modified Files:
	cairo_xlib_surface.c 
Log Message:
2004-02-02  Graydon Hoare  <graydon at redhat.com>

	* src/cairo_xlib_surface.c 
	(CAIRO_SURFACE_RENDER_HAS_FILTERS): New predicate.
	(_cairo_xlib_surface_set_filter): Skip filterless servers.
	(_cairo_xlib_surface_clone_similar): Fix typo.



Index: cairo_xlib_surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_xlib_surface.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** cairo_xlib_surface.c	30 Jan 2004 22:44:18 -0000	1.15
--- cairo_xlib_surface.c	2 Feb 2004 19:20:45 -0000	1.16
***************
*** 91,94 ****
--- 91,95 ----
  
  #define CAIRO_SURFACE_RENDER_HAS_PICTURE_TRANSFORM(surface)	CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 6)
+ #define CAIRO_SURFACE_RENDER_HAS_FILTERS(surface)	CAIRO_SURFACE_RENDER_AT_LEAST((surface), 0, 6)
  
  static int
***************
*** 321,327 ****
      char *render_filter;
  
!     if (!surface->picture)
  	return CAIRO_STATUS_SUCCESS;
! 
      switch (filter) {
      case CAIRO_FILTER_FAST:
--- 322,329 ----
      char *render_filter;
  
!     if (!(surface->picture 
! 	  && CAIRO_SURFACE_RENDER_HAS_FILTERS(surface)))
  	return CAIRO_STATUS_SUCCESS;
!     
      switch (filter) {
      case CAIRO_FILTER_FAST:
***************
*** 387,391 ****
  	return NULL;
  
!     _cairo_xlib_surface_set_filter (clone, cairo_surface_get_filter(src_image));
  
      _cairo_xlib_surface_set_image (clone, src_image);
--- 389,393 ----
  	return NULL;
  
!     _cairo_xlib_surface_set_filter (clone, cairo_surface_get_filter(src));
  
      _cairo_xlib_surface_set_image (clone, src_image);