[cairo-commit] 2 commits - src/cairo-tee-surface.c src/cairo-xcb-surface-render.c

[Uli Schlachter]

 src/cairo-tee-surface.c        |   21 +++++----------------
 src/cairo-xcb-surface-render.c |    5 -----
 2 files changed, 5 insertions(+), 21 deletions(-)

New commits:
commit a349564e3c4ef179cb65671aa389fc8e1b514305
Author: Uli Schlachter <psychon at znc.in>
Date:   Thu Sep 15 16:15:23 2011 +0200

    Revert "xcb: Error on 0x0 source surfaces"
    
    This reverts commit 8f8149a2073e1e290b6f854595caaf27bd16a80b.

diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c
index f9d33c7..a6a8c77 100644
--- a/src/cairo-xcb-surface-render.c
+++ b/src/cairo-xcb-surface-render.c
@@ -333,11 +333,6 @@ _picture_from_image (cairo_xcb_surface_t *target,
     xcb_gcontext_t gc;
     cairo_xcb_picture_t *picture;
 
-    /* FIXME: Can we somehow optimize this away at a higher layer? */
-    if (unlikely (image->width <= 0 || image->height <= 0))
-	return (cairo_xcb_picture_t *)
-	    _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_INVALID_SIZE));
-
     pixmap = _cairo_xcb_connection_create_pixmap (target->connection,
 						  image->depth,
 						  target->drawable,
commit c00e4c66714d72a524dd14e5f66add4ecc77e8fe
Author: Uli Schlachter <psychon at znc.in>
Date:   Thu Sep 15 10:42:33 2011 +0200

    Tee: compile fix for recent compositor API
    
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/cairo-tee-surface.c b/src/cairo-tee-surface.c
index bd5d264..25b4208 100644
--- a/src/cairo-tee-surface.c
+++ b/src/cairo-tee-surface.c
@@ -47,6 +47,8 @@
 #include "cairo-tee-surface-private.h"
 #include "cairo-recording-surface-private.h"
 #include "cairo-surface-wrapper-private.h"
+#include "cairo-array-private.h"
+#include "cairo-image-surface-private.h"
 
 typedef struct _cairo_tee_surface {
     cairo_surface_t base;
@@ -408,34 +410,21 @@ static const cairo_surface_backend_t cairo_tee_surface_backend = {
 
     _cairo_tee_surface_acquire_source_image,
     _cairo_tee_surface_release_source_image,
-    NULL, NULL, /* dest_image */
-    NULL, /* clone_similar */
-    NULL, /* composite */
-    NULL, /* fill_rectangles */
-    NULL, /* composite_trapezoids */
-    NULL, /* create_span_renderer */
-    NULL, /* check_span_renderer */
+    _cairo_tee_surface_snapshot,
     NULL, /* copy_page */
     NULL, /* show_page */
     _cairo_tee_surface_get_extents,
-    NULL, /* old_show_glyphs */
     _cairo_tee_surface_get_font_options,
     NULL, /* flush */
     NULL, /* mark_dirty_rectangle */
-    NULL, /* scaled_font_fini */
-    NULL, /* scaled_glyph_fini */
 
     _cairo_tee_surface_paint,
     _cairo_tee_surface_mask,
     _cairo_tee_surface_stroke,
     _cairo_tee_surface_fill,
-    NULL, /* replaced by show_text_glyphs */
-
-    _cairo_tee_surface_snapshot,
-    NULL, /* is_similar */
     NULL, /* fill_stroke */
-    NULL, /* create_solid_pattern_surface */
-    NULL, /* can_repaint_solid_pattern_surface */
+
+    NULL, /* show_glyphs */
 
     _cairo_tee_surface_has_show_text_glyphs,
     _cairo_tee_surface_show_text_glyphs