--- a/gfx/cairo/README
+++ b/gfx/cairo/README
@@ -2,18 +2,18 @@ Snapshots of cairo and glitz for mozilla
 
 We only include the relevant parts of each release (generally, src/*.[ch]),
 as we have Makefile.in's that integrate into the Mozilla build system.  For
 documentation and similar, please see the official tarballs at
 http://www.cairographics.org/.
 
 VERSIONS:
 
-  cairo (1.7.4-136-g5ea2555)
-  pixman (pixman-0.11.10-8-g7180230)
+  cairo (1.8.2)
+  pixman (pixman-0.12.0-19-g95f2af9)
 
 ***** NOTE FOR VISUAL C++ 6.0 *****
 
 VC6 is not supported.  Please upgrade to VC8.
 
 ==== Patches ====
 
 Some specific things:
@@ -23,15 +23,17 @@ max-font-size.patch: Clamp freetype font
 win32-logical-font-scale.patch: set CAIRO_WIN32_LOGICAL_FONT_SCALE to 1
 
 nonfatal-assertions.patch: Make assertions non-fatal
 
 buggy-repeat.patch: Unconditionally turn on buggy-repeat handling to bandaid bug 413583.
 
 tmpfile_wince.patch: Make Windows CE use tmpfile() on windows mobile due to the lack of _open_osfhandle and no fs permissions.
 
+cairo-version-fixes.patch: fix up cairo-version.c/cairo-version.h for in-place builds
+
 ==== pixman patches ====
 
 endian.patch: include cairo-platform.h for endian macros
 
 ==== disable printing patch ====
 
 disable-printing.patch:  allows us to use NS_PRINTING to disable printing.

--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -80,16 +80,18 @@ CSRCS   = \
         cairo-bentley-ottmann.c \
         cairo-cache.c \
         cairo-clip.c \
         cairo-color.c \
         cairo-debug.c \
         cairo-deflate-stream.c \
         cairo-fixed.c \
 	cairo-font-face.c \
+	cairo-font-face-twin.c \
+	cairo-font-face-twin-data.c \
         cairo-font-options.c \
         cairo-freelist.c \
         cairo-gstate.c \
         cairo-hash.c \
         cairo-hull.c \
         cairo-image-surface.c \
         cairo-lzw.c \
         cairo-matrix.c \

--- a/gfx/cairo/cairo/src/cairo-analysis-surface-private.h
+++ b/gfx/cairo/cairo/src/cairo-analysis-surface-private.h
@@ -61,13 +61,16 @@ cairo_private cairo_bool_t
 
 cairo_private cairo_bool_t
 _cairo_analysis_surface_has_unsupported (cairo_surface_t *surface);
 
 cairo_private void
 _cairo_analysis_surface_get_bounding_box (cairo_surface_t *surface,
 					  cairo_box_t     *bbox);
 
+cairo_private cairo_int_status_t
+_cairo_analysis_surface_merge_status (cairo_int_status_t status_a,
+				      cairo_int_status_t status_b);
 
 cairo_private cairo_surface_t *
 _cairo_null_surface_create (cairo_content_t content);
 
 #endif /* CAIRO_ANALYSIS_SURFACE_H */

--- a/gfx/cairo/cairo/src/cairo-analysis-surface.c
+++ b/gfx/cairo/cairo/src/cairo-analysis-surface.c
@@ -57,19 +57,51 @@ typedef struct {
     cairo_rectangle_int_t current_clip;
     cairo_box_t page_bbox;
 
     cairo_bool_t has_ctm;
     cairo_matrix_t ctm;
 
 } cairo_analysis_surface_t;
 
+cairo_int_status_t
+_cairo_analysis_surface_merge_status (cairo_int_status_t status_a,
+				      cairo_int_status_t status_b)
+{
+    /* fatal errors should be checked and propagated at source */
+    assert (! _cairo_status_is_error (status_a));
+    assert (! _cairo_status_is_error (status_b));
+
+    /* return the most important status */
+    if (status_a == CAIRO_INT_STATUS_UNSUPPORTED ||
+	status_b == CAIRO_INT_STATUS_UNSUPPORTED)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    if (status_a == CAIRO_INT_STATUS_IMAGE_FALLBACK ||
+	status_b == CAIRO_INT_STATUS_IMAGE_FALLBACK)
+	return CAIRO_INT_STATUS_IMAGE_FALLBACK;
+
+    if (status_a == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN ||
+	status_b == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN)
+	return CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN;
+
+    if (status_a == CAIRO_INT_STATUS_FLATTEN_TRANSPARENCY ||
+	status_b == CAIRO_INT_STATUS_FLATTEN_TRANSPARENCY)
+	return CAIRO_INT_STATUS_FLATTEN_TRANSPARENCY;
+
+    /* at this point we have checked all the valid internal codes, so... */
+    assert (status_a == CAIRO_STATUS_SUCCESS &&
+	    status_b == CAIRO_STATUS_SUCCESS);
+
+    return CAIRO_STATUS_SUCCESS;
+}
+
 static cairo_int_status_t
-_cairo_analysis_surface_analyze_meta_surface_pattern (cairo_analysis_surface_t *surface,
-						      cairo_pattern_t	       *pattern)
+_analyze_meta_surface_pattern (cairo_analysis_surface_t	*surface,
+			       cairo_pattern_t		*pattern)
 {
     cairo_surface_t *analysis = &surface->base;
     cairo_surface_pattern_t *surface_pattern;
     cairo_status_t status;
     cairo_bool_t old_has_ctm;
     cairo_matrix_t old_ctm, p2d;
     cairo_rectangle_int_t old_clip;
     cairo_rectangle_int_t meta_extents;
@@ -113,19 +145,19 @@ static cairo_int_status_t
     surface->current_clip = old_clip;
     surface->width = old_width;
     surface->height = old_height;
 
     return status;
 }
 
 static cairo_int_status_t
-_cairo_analysis_surface_add_operation  (cairo_analysis_surface_t *surface,
-					cairo_rectangle_int_t    *rect,
-					cairo_int_status_t        backend_status)
+_add_operation  (cairo_analysis_surface_t *surface,
+		 cairo_rectangle_int_t    *rect,
+		 cairo_int_status_t        backend_status)
 {
     cairo_int_status_t status;
     cairo_box_t bbox;
 
     if (rect->width == 0 || rect->height == 0) {
 	/* Even though the operation is not visible we must be careful
 	 * to not allow unsupported operations to be replayed to the
 	 * backend during CAIRO_PAGINATED_MODE_RENDER */
@@ -297,75 +329,81 @@ static cairo_int_status_t
 
     if (!surface->target->backend->paint)
 	backend_status = CAIRO_INT_STATUS_UNSUPPORTED;
     else
 	backend_status = (*surface->target->backend->paint) (surface->target, op,
                                                              source);
 
     if (backend_status == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN)
-	backend_status = _cairo_analysis_surface_analyze_meta_surface_pattern (surface,
-									       source);
+	backend_status = _analyze_meta_surface_pattern (surface, source);
 
     status = _cairo_surface_get_extents (&surface->base, &extents);
     if (status && status != CAIRO_INT_STATUS_UNSUPPORTED)
 	return status;
 
     if (_cairo_operator_bounded_by_source (op)) {
 	cairo_rectangle_int_t source_extents;
 	status = _cairo_pattern_get_extents (source, &source_extents);
 	if (status)
 	    return status;
 
 	_cairo_rectangle_intersect (&extents, &source_extents);
     }
 
     _cairo_rectangle_intersect (&extents, &surface->current_clip);
 
-    status = _cairo_analysis_surface_add_operation (surface, &extents, backend_status);
+    status = _add_operation (surface, &extents, backend_status);
 
     return status;
 }
 
 static cairo_int_status_t
 _cairo_analysis_surface_mask (void		*abstract_surface,
 			      cairo_operator_t	 op,
 			      cairo_pattern_t	*source,
 			      cairo_pattern_t	*mask)
 {
     cairo_analysis_surface_t *surface = abstract_surface;
-    cairo_status_t	      status, backend_status;
+    cairo_int_status_t	      status, backend_status;
     cairo_rectangle_int_t   extents;
 
     if (!surface->target->backend->mask)
 	backend_status = CAIRO_INT_STATUS_UNSUPPORTED;
     else
 	backend_status = (*surface->target->backend->mask) (surface->target, op,
                                                             source, mask);
 
     if (backend_status == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN) {
+	cairo_int_status_t backend_source_status = CAIRO_STATUS_SUCCESS;
+	cairo_int_status_t backend_mask_status = CAIRO_STATUS_SUCCESS;
+
 	if (source->type == CAIRO_PATTERN_TYPE_SURFACE) {
 	    cairo_surface_pattern_t *surface_pattern = (cairo_surface_pattern_t *) source;
-	    if (_cairo_surface_is_meta (surface_pattern->surface))
-		backend_status = _cairo_analysis_surface_analyze_meta_surface_pattern (surface,
-										       source);
-	    if (backend_status != CAIRO_STATUS_SUCCESS &&
-		backend_status != CAIRO_INT_STATUS_IMAGE_FALLBACK)
-		return backend_status;
+	    if (_cairo_surface_is_meta (surface_pattern->surface)) {
+		backend_source_status =
+		    _analyze_meta_surface_pattern (surface, source);
+		if (_cairo_status_is_error (backend_source_status))
+		    return backend_source_status;
+	    }
 	}
 
 	if (mask->type == CAIRO_PATTERN_TYPE_SURFACE) {
 	    cairo_surface_pattern_t *surface_pattern = (cairo_surface_pattern_t *) mask;
-	    if (_cairo_surface_is_meta (surface_pattern->surface))
-		backend_status = _cairo_analysis_surface_analyze_meta_surface_pattern (surface,
-										       mask);
-	    if (backend_status != CAIRO_STATUS_SUCCESS &&
-		backend_status != CAIRO_INT_STATUS_IMAGE_FALLBACK)
-		return backend_status;
+	    if (_cairo_surface_is_meta (surface_pattern->surface)) {
+		backend_mask_status =
+		    _analyze_meta_surface_pattern (surface, mask);
+		if (_cairo_status_is_error (backend_mask_status))
+		    return backend_mask_status;
+	    }
 	}
+
+	backend_status =
+	    _cairo_analysis_surface_merge_status (backend_source_status,
+						  backend_mask_status);
     }
 
     status = _cairo_surface_get_extents (&surface->base, &extents);
     if (status && status != CAIRO_INT_STATUS_UNSUPPORTED)
 	return status;
 
     if (_cairo_operator_bounded_by_source (op)) {
 	cairo_rectangle_int_t source_extents;
@@ -379,17 +417,17 @@ static cairo_int_status_t
 	if (status)
 	    return status;
 
 	_cairo_rectangle_intersect (&extents, &source_extents);
     }
 
     _cairo_rectangle_intersect (&extents, &surface->current_clip);
 
-    status = _cairo_analysis_surface_add_operation (surface, &extents, backend_status);
+    status = _add_operation (surface, &extents, backend_status);
 
     return status;
 }
 
 static cairo_int_status_t
 _cairo_analysis_surface_stroke (void			*abstract_surface,
 				cairo_operator_t	 op,
 				cairo_pattern_t		*source,
@@ -398,30 +436,28 @@ static cairo_int_status_t
 				cairo_matrix_t		*ctm,
 				cairo_matrix_t		*ctm_inverse,
 				double			 tolerance,
 				cairo_antialias_t	 antialias)
 {
     cairo_analysis_surface_t *surface = abstract_surface;
     cairo_status_t	     status, backend_status;
     cairo_traps_t            traps;
-    cairo_box_t              box;
     cairo_rectangle_int_t  extents;
 
     if (!surface->target->backend->stroke)
 	backend_status = CAIRO_INT_STATUS_UNSUPPORTED;
     else
 	backend_status = (*surface->target->backend->stroke) (surface->target, op,
 							      source, path, style,
 							      ctm, ctm_inverse,
 							      tolerance, antialias);
 
     if (backend_status == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN)
-	backend_status = _cairo_analysis_surface_analyze_meta_surface_pattern (surface,
-									       source);
+	backend_status = _analyze_meta_surface_pattern (surface, source);
 
     status = _cairo_surface_get_extents (&surface->base, &extents);
     if (status && status != CAIRO_INT_STATUS_UNSUPPORTED)
 	return status;
 
     if (_cairo_operator_bounded_by_source (op)) {
 	cairo_rectangle_int_t source_extents;
 	status = _cairo_pattern_get_extents (source, &source_extents);
@@ -429,78 +465,66 @@ static cairo_int_status_t
 	    return status;
 
 	_cairo_rectangle_intersect (&extents, &source_extents);
     }
 
     _cairo_rectangle_intersect (&extents, &surface->current_clip);
 
     if (_cairo_operator_bounded_by_mask (op)) {
-	box.p1.x = _cairo_fixed_from_int (extents.x);
-	box.p1.y = _cairo_fixed_from_int (extents.y);
-	box.p2.x = _cairo_fixed_from_int (extents.x + extents.width);
-	box.p2.y = _cairo_fixed_from_int (extents.y + extents.height);
+	cairo_box_t box;
+
+	_cairo_box_from_rectangle (&box, &extents);
 
 	_cairo_traps_init (&traps);
 	_cairo_traps_limit (&traps, &box);
 	status = _cairo_path_fixed_stroke_to_traps (path,
 						    style,
 						    ctm, ctm_inverse,
 						    tolerance,
 						    &traps);
 	if (status) {
 	    _cairo_traps_fini (&traps);
 	    return status;
 	}
 
-	if (traps.num_traps == 0) {
-	    extents.x = 0;
-	    extents.y = 0;
-	    extents.width = 0;
-	    extents.height = 0;
-	} else {
-	    _cairo_traps_extents (&traps, &box);
-	    extents.x = _cairo_fixed_integer_floor (box.p1.x);
-	    extents.y = _cairo_fixed_integer_floor (box.p1.y);
-	    extents.width = _cairo_fixed_integer_ceil (box.p2.x) - extents.x;
-	    extents.height = _cairo_fixed_integer_ceil (box.p2.y) - extents.y;
-	}
+	_cairo_traps_extents (&traps, &box);
 	_cairo_traps_fini (&traps);
+
+        _cairo_box_round_to_rectangle (&box, &extents);
     }
 
-    status = _cairo_analysis_surface_add_operation (surface, &extents, backend_status);
+    status = _add_operation (surface, &extents, backend_status);
 
     return status;
 }
 
 static cairo_int_status_t
 _cairo_analysis_surface_fill (void			*abstract_surface,
 			      cairo_operator_t		 op,
 			      cairo_pattern_t		*source,
 			      cairo_path_fixed_t	*path,
 			      cairo_fill_rule_t		 fill_rule,
 			      double			 tolerance,
 			      cairo_antialias_t		 antialias)
 {
     cairo_analysis_surface_t *surface = abstract_surface;
     cairo_status_t	     status, backend_status;
     cairo_traps_t            traps;
-    cairo_box_t              box;
     cairo_rectangle_int_t  extents;
 
     if (!surface->target->backend->fill)
 	backend_status = CAIRO_INT_STATUS_UNSUPPORTED;
     else
 	backend_status = (*surface->target->backend->fill) (surface->target, op,
 						    source, path, fill_rule,
 						    tolerance, antialias);
 
     if (backend_status == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN)
-	backend_status = _cairo_analysis_surface_analyze_meta_surface_pattern (surface,
-									       source);
+	backend_status = _analyze_meta_surface_pattern (surface, source);
 
     status = _cairo_surface_get_extents (&surface->base, &extents);
     if (status && status != CAIRO_INT_STATUS_UNSUPPORTED)
 	return status;
 
     if (_cairo_operator_bounded_by_source (op)) {
 	cairo_rectangle_int_t source_extents;
 	status = _cairo_pattern_get_extents (source, &source_extents);
@@ -508,49 +532,38 @@ static cairo_int_status_t
 	    return status;
 
 	_cairo_rectangle_intersect (&extents, &source_extents);
     }
 
     _cairo_rectangle_intersect (&extents, &surface->current_clip);
 
     if (_cairo_operator_bounded_by_mask (op)) {
-	box.p1.x = _cairo_fixed_from_int (extents.x);
-	box.p1.y = _cairo_fixed_from_int (extents.y);
-	box.p2.x = _cairo_fixed_from_int (extents.x + extents.width);
-	box.p2.y = _cairo_fixed_from_int (extents.y + extents.height);
+	cairo_box_t box;
+
+	_cairo_box_from_rectangle (&box, &extents);
 
 	_cairo_traps_init (&traps);
 	_cairo_traps_limit (&traps, &box);
 	status = _cairo_path_fixed_fill_to_traps (path,
 						  fill_rule,
 						  tolerance,
 						  &traps);
 	if (status) {
 	    _cairo_traps_fini (&traps);
 	    return status;
 	}
 
-	if (traps.num_traps == 0) {
-	    extents.x = 0;
-	    extents.y = 0;
-	    extents.width = 0;
-	    extents.height = 0;
-	} else {
-	    _cairo_traps_extents (&traps, &box);
-	    extents.x = _cairo_fixed_integer_floor (box.p1.x);
-	    extents.y = _cairo_fixed_integer_floor (box.p1.y);
-	    extents.width = _cairo_fixed_integer_ceil (box.p2.x) - extents.x;
-	    extents.height = _cairo_fixed_integer_ceil (box.p2.y) - extents.y;
-	}
+	_cairo_traps_extents (&traps, &box);
+	_cairo_traps_fini (&traps);
 
-	_cairo_traps_fini (&traps);
+        _cairo_box_round_to_rectangle (&box, &extents);
     }
 
-    status = _cairo_analysis_surface_add_operation (surface, &extents, backend_status);
+    status = _add_operation (surface, &extents, backend_status);
 
     return status;
 }
 
 static cairo_int_status_t
 _cairo_analysis_surface_show_glyphs (void		  *abstract_surface,
 				     cairo_operator_t	   op,
 				     cairo_pattern_t	  *source,
@@ -577,18 +590,17 @@ static cairo_int_status_t
 								     glyphs, num_glyphs,
 								     NULL, 0,
 								     FALSE,
 								     scaled_font);
     else
 	backend_status = CAIRO_INT_STATUS_UNSUPPORTED;
 
     if (backend_status == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN)
-	backend_status = _cairo_analysis_surface_analyze_meta_surface_pattern (surface,
-									       source);
+	backend_status = _analyze_meta_surface_pattern (surface, source);
 
     status = _cairo_surface_get_extents (&surface->base, &extents);
     if (status && status != CAIRO_INT_STATUS_UNSUPPORTED)
 	return status;
 
     if (_cairo_operator_bounded_by_source (op)) {
 	cairo_rectangle_int_t source_extents;
 	status = _cairo_pattern_get_extents (source, &source_extents);
@@ -606,17 +618,17 @@ static cairo_int_status_t
 							  num_glyphs,
 							  &glyph_extents);
 	if (status)
 	    return status;
 
 	_cairo_rectangle_intersect (&extents, &glyph_extents);
     }
 
-    status = _cairo_analysis_surface_add_operation (surface, &extents, backend_status);
+    status = _add_operation (surface, &extents, backend_status);
 
     return status;
 }
 
 static cairo_bool_t
 _cairo_analysis_surface_has_show_text_glyphs (void *abstract_surface)
 {
     cairo_analysis_surface_t *surface = abstract_surface;
@@ -629,49 +641,47 @@ static cairo_int_status_t
 					  cairo_operator_t	     op,
 					  cairo_pattern_t	    *source,
 					  const char		    *utf8,
 					  int			     utf8_len,
 					  cairo_glyph_t		    *glyphs,
 					  int			     num_glyphs,
 					  const cairo_text_cluster_t *clusters,
 					  int			     num_clusters,
-					  cairo_bool_t		     backward,
+					  cairo_text_cluster_flags_t cluster_flags,
 					  cairo_scaled_font_t	    *scaled_font)
 {
     cairo_analysis_surface_t *surface = abstract_surface;
     cairo_status_t	     status, backend_status;
     cairo_rectangle_int_t    extents, glyph_extents;
 
     /* Adapted from _cairo_surface_show_glyphs */
     backend_status = CAIRO_INT_STATUS_UNSUPPORTED;
     if (surface->target->backend->show_text_glyphs)
 	backend_status = surface->target->backend->show_text_glyphs (surface->target, op,
 								     source,
 								     utf8, utf8_len,
 								     glyphs, num_glyphs,
-								     clusters, num_clusters,
-								     backward,
+								     clusters, num_clusters, cluster_flags,
 								     scaled_font);
     if (backend_status == CAIRO_INT_STATUS_UNSUPPORTED && surface->target->backend->show_glyphs) {
 	int remaining_glyphs = num_glyphs;
 	backend_status = surface->target->backend->show_glyphs (surface->target, op,
 								source,
 								glyphs, num_glyphs,
 								scaled_font,
 								&remaining_glyphs);
 	glyphs += num_glyphs - remaining_glyphs;
 	num_glyphs = remaining_glyphs;
 	if (remaining_glyphs == 0)
 	    backend_status = CAIRO_STATUS_SUCCESS;
     }
 
     if (backend_status == CAIRO_INT_STATUS_ANALYZE_META_SURFACE_PATTERN)
-	backend_status = _cairo_analysis_surface_analyze_meta_surface_pattern (surface,
-									       source);
+	backend_status = _analyze_meta_surface_pattern (surface, source);
 
     status = _cairo_surface_get_extents (&surface->base, &extents);
     if (status && status != CAIRO_INT_STATUS_UNSUPPORTED)
 	return status;
 
     if (_cairo_operator_bounded_by_source (op)) {
 	cairo_rectangle_int_t source_extents;
 	status = _cairo_pattern_get_extents (source, &source_extents);
@@ -689,17 +699,17 @@ static cairo_int_status_t
 							  num_glyphs,
 							  &glyph_extents);
 	if (status)
 	    return status;
 
 	_cairo_rectangle_intersect (&extents, &glyph_extents);
     }
 
-    status = _cairo_analysis_surface_add_operation (surface, &extents, backend_status);
+    status = _add_operation (surface, &extents, backend_status);
 
     return status;
 }
 
 static const cairo_surface_backend_t cairo_analysis_surface_backend = {
     CAIRO_INTERNAL_SURFACE_TYPE_ANALYSIS,
     NULL, /* create_similar */
     _cairo_analysis_surface_finish,
@@ -737,16 +747,21 @@ static const cairo_surface_backend_t cai
 };
 
 cairo_surface_t *
 _cairo_analysis_surface_create (cairo_surface_t		*target,
 				int			 width,
 				int			 height)
 {
     cairo_analysis_surface_t *surface;
+    cairo_status_t status;
+
+    status = target->status;
+    if (status)
+	return _cairo_surface_create_in_error (status);
 
     surface = malloc (sizeof (cairo_analysis_surface_t));
     if (surface == NULL)
 	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
 
     /* I believe the content type here is truly arbitrary. I'm quite
      * sure nothing will ever use this value. */
     _cairo_surface_init (&surface->base, &cairo_analysis_surface_backend,
@@ -780,27 +795,32 @@ cairo_surface_t *
 	surface->current_clip.y = 0;
 	surface->current_clip.width = width;
 	surface->current_clip.height = height;
     }
 
     return &surface->base;
 }
 
-cairo_private void
+void
 _cairo_analysis_surface_set_ctm (cairo_surface_t *abstract_surface,
 				 cairo_matrix_t  *ctm)
 {
-    cairo_analysis_surface_t	*surface = (cairo_analysis_surface_t *) abstract_surface;
+    cairo_analysis_surface_t	*surface;
+
+    if (abstract_surface->status)
+	return;
+
+    surface = (cairo_analysis_surface_t *) abstract_surface;
 
     surface->ctm = *ctm;
     surface->has_ctm = !_cairo_matrix_is_identity (&surface->ctm);
 }
 
-cairo_private void
+void
 _cairo_analysis_surface_get_ctm (cairo_surface_t *abstract_surface,
 				 cairo_matrix_t  *ctm)
 {
     cairo_analysis_surface_t	*surface = (cairo_analysis_surface_t *) abstract_surface;
 
     *ctm = surface->ctm;
 }
 

--- a/gfx/cairo/cairo/src/cairo-array.c
+++ b/gfx/cairo/cairo/src/cairo-array.c
@@ -80,16 +80,17 @@ void
     array->element_size = other->element_size;
     array->elements = other->elements;
 
     array->is_snapshot = TRUE;
 }
 
 /**
  * _cairo_array_fini:
+ * @array: A #cairo_array_t
  *
  * Free all resources associated with @array. After this call, @array
  * should not be used again without a subsequent call to
  * _cairo_array_init() again first.
  **/
 void
 _cairo_array_fini (cairo_array_t *array)
 {
@@ -99,16 +100,17 @@ void
     if (array->elements) {
 	free (* array->elements);
 	free (array->elements);
     }
 }
 
 /**
  * _cairo_array_grow_by:
+ * @array: a #cairo_array_t
  *
  * Increase the size of @array (if needed) so that there are at least
  * @additional free spaces in the array. The actual size of the array
  * is always increased by doubling as many times as necessary.
  **/
 cairo_status_t
 _cairo_array_grow_by (cairo_array_t *array, unsigned int additional)
 {
@@ -153,48 +155,52 @@ cairo_status_t
 
     *array->elements = new_elements;
 
     return CAIRO_STATUS_SUCCESS;
 }
 
 /**
  * _cairo_array_truncate:
+ * @array: a #cairo_array_t
  *
  * Truncate size of the array to @num_elements if less than the
  * current size. No memory is actually freed. The stored objects
  * beyond @num_elements are simply "forgotten".
  **/
 void
 _cairo_array_truncate (cairo_array_t *array, unsigned int num_elements)
 {
     assert (! array->is_snapshot);
 
     if (num_elements < array->num_elements)
 	array->num_elements = num_elements;
 }
 
 /**
  * _cairo_array_index:
+ * @array: a #cairo_array_t
+ * Returns: A pointer to the object stored at @index.
  *
- * Return value: A pointer to object stored at @index. If the
- * resulting value is assigned to a pointer to an object of the same
+ * If the resulting value is assigned to a pointer to an object of the same
  * element_size as initially passed to _cairo_array_init() then that
  * pointer may be used for further direct indexing with []. For
  * example:
  *
- * 	#cairo_array_t array;
+ * <informalexample><programlisting>
+ *	cairo_array_t array;
  *	double *values;
  *
  *	_cairo_array_init (&array, sizeof(double));
  *	... calls to _cairo_array_append() here ...
  *
  *	values = _cairo_array_index (&array, 0);
  *      for (i = 0; i < _cairo_array_num_elements (&array); i++)
  *	    ... use values[i] here ...
+ * </programlisting></informalexample>
  **/
 void *
 _cairo_array_index (cairo_array_t *array, unsigned int index)
 {
     /* We allow an index of 0 for the no-elements case.
      * This makes for cleaner calling code which will often look like:
      *
      *    elements = _cairo_array_index (array, num_elements);
@@ -210,28 +216,30 @@ void *
 
     assert (index < array->num_elements);
 
     return (void *) &(*array->elements)[index * array->element_size];
 }
 
 /**
  * _cairo_array_copy_element:
+ * @array: a #cairo_array_t
  *
  * Copy a single element out of the array from index @index into the
  * location pointed to by @dst.
  **/
 void
 _cairo_array_copy_element (cairo_array_t *array, int index, void *dst)
 {
     memcpy (dst, _cairo_array_index (array, index), array->element_size);
 }
 
 /**
  * _cairo_array_append:
+ * @array: a #cairo_array_t
  *
  * Append a single item onto the array by growing the array by at
  * least one element, then copying element_size bytes from @element
  * into the array. The address of the resulting object within the
  * array can be determined with:
  *
  * _cairo_array_index (array, _cairo_array_num_elements (array) - 1);
  *
@@ -245,16 +253,17 @@ cairo_status_t
 {
     assert (! array->is_snapshot);
 
     return _cairo_array_append_multiple (array, element, 1);
 }
 
 /**
  * _cairo_array_append:
+ * @array: a #cairo_array_t
  *
  * Append one or more items onto the array by growing the array by
  * @num_elements, then copying @num_elements * element_size bytes from
  * @elements into the array.
  *
  * Return value: %CAIRO_STATUS_SUCCESS if successful or
  * %CAIRO_STATUS_NO_MEMORY if insufficient memory is available for the
  * operation.
@@ -275,16 +284,17 @@ cairo_status_t
 
     memcpy (dest, elements, num_elements * array->element_size);
 
     return CAIRO_STATUS_SUCCESS;
 }
 
 /**
  * _cairo_array_allocate:
+ * @array: a #cairo_array_t
  *
  * Allocate space at the end of the array for @num_elements additional
  * elements, providing the address of the new memory chunk in
  * @elements. This memory will be unitialized, but will be accounted
  * for in the return value of _cairo_array_num_elements().
  *
  * Return value: %CAIRO_STATUS_SUCCESS if successful or
  * %CAIRO_STATUS_NO_MEMORY if insufficient memory is available for the
@@ -309,30 +319,34 @@ cairo_status_t
 
     array->num_elements += num_elements;
 
     return CAIRO_STATUS_SUCCESS;
 }
 
 /**
  * _cairo_array_num_elements:
+ * @array: a #cairo_array_t
+ * Returns: The number of elements stored in @array.
  *
- * Return value: The number of elements stored in @array.
+ * This space was left intentionally blank, but gtk-doc filled it.
  **/
 int
 _cairo_array_num_elements (cairo_array_t *array)
 {
     return array->num_elements;
 }
 
 /**
  * _cairo_array_size:
+ * @array: a #cairo_array_t
+ * Returns: The number of elements for which there is currently space
+ * allocated in @array.
  *
- * Return value: The number of elements for which there is currently
- * space allocated in array.
+ * This space was left intentionally blank, but gtk-doc filled it.
  **/
 int
 _cairo_array_size (cairo_array_t *array)
 {
     return array->size;
 }
 
 /* #cairo_user_data_array_t */

--- a/gfx/cairo/cairo/src/cairo-atomic-private.h
+++ b/gfx/cairo/cairo/src/cairo-atomic-private.h
@@ -32,53 +32,54 @@
  *
  * Contributor(s):
  *	Chris Wilson <chris@chris-wilson.co.uk>
  */
 
 #ifndef CAIRO_ATOMIC_PRIVATE_H
 #define CAIRO_ATOMIC_PRIVATE_H
 
+# include "cairo-compiler-private.h"
+
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 CAIRO_BEGIN_DECLS
 
-#define CAIRO_HAS_ATOMIC_OPS 1
+#if HAVE_INTEL_ATOMIC_PRIMITIVES
 
-#if CAIRO_HAS_INTEL_ATOMIC_PRIMITIVES
+#define HAS_ATOMIC_OPS 1
 
 typedef int cairo_atomic_int_t;
 
 # define _cairo_atomic_int_inc(x) ((void) __sync_fetch_and_add(x, 1))
 # define _cairo_atomic_int_dec_and_test(x) (__sync_fetch_and_add(x, -1) == 1)
 # define _cairo_atomic_int_cmpxchg(x, oldv, newv) __sync_val_compare_and_swap (x, oldv, newv)
 
-#else
+#endif
 
-# include "cairo-compiler-private.h"
 
-# undef CAIRO_HAS_ATOMIC_OPS
+#ifndef HAS_ATOMIC_OPS
 
 typedef int cairo_atomic_int_t;
 
 cairo_private void
 _cairo_atomic_int_inc (int *x);
 
 cairo_private cairo_bool_t
 _cairo_atomic_int_dec_and_test (int *x);
 
 cairo_private int
 _cairo_atomic_int_cmpxchg (int *x, int oldv, int newv);
 
 #endif
 
 
-#ifdef CAIRO_ATOMIC_OP_NEEDS_MEMORY_BARRIER
+#ifdef ATOMIC_OP_NEEDS_MEMORY_BARRIER
 
 # include "cairo-compiler-private.h"
 
 cairo_private int
 _cairo_atomic_int_get (int *x);
 
 cairo_private void
 _cairo_atomic_int_set (int *x, int value);

--- a/gfx/cairo/cairo/src/cairo-atomic.c
+++ b/gfx/cairo/cairo/src/cairo-atomic.c
@@ -31,17 +31,17 @@
  *	Chris Wilson <chris@chris-wilson.co.uk>
  */
 
 #include "cairoint.h"
 
 #include "cairo-atomic-private.h"
 #include "cairo-mutex-private.h"
 
-#ifndef CAIRO_HAS_ATOMIC_OPS
+#ifndef HAS_ATOMIC_OPS
 void
 _cairo_atomic_int_inc (int *x)
 {
     CAIRO_MUTEX_LOCK (_cairo_atomic_mutex);
     *x += 1;
     CAIRO_MUTEX_UNLOCK (_cairo_atomic_mutex);
 }
 
@@ -68,17 +68,17 @@ int
 	*x = newv;
     CAIRO_MUTEX_UNLOCK (_cairo_atomic_mutex);
 
     return ret;
 }
 
 #endif
 
-#ifdef CAIRO_ATOMIC_OP_NEEDS_MEMORY_BARRIER
+#ifdef ATOMIC_OP_NEEDS_MEMORY_BARRIER
 int
 _cairo_atomic_int_get (int *x)
 {
     int ret;
 
     CAIRO_MUTEX_LOCK (_cairo_atomic_mutex);
     ret = *x;
     CAIRO_MUTEX_UNLOCK (_cairo_atomic_mutex);

--- a/gfx/cairo/cairo/src/cairo-bentley-ottmann.c
+++ b/gfx/cairo/cairo/src/cairo-bentley-ottmann.c
@@ -34,16 +34,19 @@
  */
 
 /* Provide definitions for standalone compilation */
 #include "cairoint.h"
 
 #include "cairo-skiplist-private.h"
 #include "cairo-freelist-private.h"
 
+#define DEBUG_VALIDATE 0
+#define DEBUG_PRINT_STATE 0
+
 typedef cairo_point_t cairo_bo_point32_t;
 
 typedef struct _cairo_bo_point128 {
     cairo_int128_t x;
     cairo_int128_t y;
 } cairo_bo_point128_t;
 
 typedef struct _cairo_bo_intersect_ordinate {
@@ -193,79 +196,180 @@ static int
     int32_t adx = a->bottom.x - a->top.x;
     int32_t bdx = b->bottom.x - b->top.x;
 
     /* Since the dy's are all positive by construction we can fast
      * path the case where the two edges point in different directions
      * with respect to x. */
     if ((adx ^ bdx) < 0) {
 	return adx < 0 ? -1 : +1;
-    }
-    else {
+    } else {
 	int32_t ady = a->bottom.y - a->top.y;
 	int32_t bdy = b->bottom.y - b->top.y;
-	int64_t adx_bdy = _cairo_int32x32_64_mul (adx, bdy);
-	int64_t bdx_ady = _cairo_int32x32_64_mul (bdx, ady);
+	cairo_int64_t adx_bdy = _cairo_int32x32_64_mul (adx, bdy);
+	cairo_int64_t bdx_ady = _cairo_int32x32_64_mul (bdx, ady);
 
-	/* if (adx * bdy > bdx * ady) */
-	if (_cairo_int64_gt (adx_bdy, bdx_ady))
-	    return 1;
-
-	/* if (adx * bdy < bdx * ady) */
-	if (_cairo_int64_lt (adx_bdy, bdx_ady))
-	    return -1;
-	return 0;
+	return _cairo_int64_cmp (adx_bdy, bdx_ady);
     }
 }
 
-static cairo_quorem64_t
-edge_x_for_y (cairo_bo_edge_t *edge,
-	      int32_t y)
+/*
+ * We need to compare the x-coordinates of a pair of lines for a particular y,
+ * without loss of precision.
+ *
+ * The x-coordinate along an edge for a given y is:
+ *   X = A_x + (Y - A_y) * A_dx / A_dy
+ *
+ * So the inequality we wish to test is:
+ *   A_x + (Y - A_y) * A_dx / A_dy -?- B_x + (Y - B_y) * B_dx / B_dy,
+ * where -?- is our inequality operator.
+ *
+ * By construction, we know that A_dy and B_dy (and (Y - A_y), (Y - B_y)) are
+ * all positive, so we can rearrange it thus without causing a sign change:
+ *   A_dy * B_dy * (A_x - B_x) -?- (Y - B_y) * B_dx * A_dy
+ *                                 - (Y - A_y) * A_dx * B_dy
+ *
+ * Given the assumption that all the deltas fit within 32 bits, we can compute
+ * this comparison directly using 128 bit arithmetic.
+ *
+ * (And put the burden of the work on developing fast 128 bit ops, which are
+ * required throughout the tessellator.)
+ *
+ * See the similar discussion for _slope_compare().
+ */
+static int
+edges_compare_x_for_y_general (const cairo_bo_edge_t *a,
+			       const cairo_bo_edge_t *b,
+			       int32_t y)
 {
     /* XXX: We're assuming here that dx and dy will still fit in 32
      * bits. That's not true in general as there could be overflow. We
      * should prevent that before the tessellation algorithm
      * begins.
      */
-    int32_t dx = edge->bottom.x - edge->top.x;
-    int32_t dy = edge->bottom.y - edge->top.y;
-    int64_t numerator;
-    cairo_quorem64_t quorem;
+    int32_t adx, ady;
+    int32_t bdx, bdy;
+    cairo_int128_t L, R;
+
+    adx = a->bottom.x - a->top.x;
+    ady = a->bottom.y - a->top.y;
+
+    bdx = b->bottom.x - b->top.x;
+    bdy = b->bottom.y - b->top.y;
+
+    L = _cairo_int64x32_128_mul (_cairo_int32x32_64_mul (ady, bdy),
+				 a->top.x - b->top.x);
+
+    R = _cairo_int128_sub (_cairo_int64x32_128_mul (_cairo_int32x32_64_mul (bdx,
+									    ady),
+						    y - b->top.y),
+			   _cairo_int64x32_128_mul (_cairo_int32x32_64_mul (adx,
+									    bdy),
+						    y - a->top.y));
+
+    /* return _cairo_int128_cmp (L, R); */
+    if (_cairo_int128_lt (L, R))
+	return -1;
+    if (_cairo_int128_gt (L, R))
+	return 1;
+    return 0;
+}
 
-    if (edge->middle.y == y) {
-       quorem.quo = edge->middle.x;
-       quorem.rem = 0;
-       return quorem;
+/*
+ * We need to compare the x-coordinate of a line for a particular y wrt to a
+ * given x, without loss of precision.
+ *
+ * The x-coordinate along an edge for a given y is:
+ *   X = A_x + (Y - A_y) * A_dx / A_dy
+ *
+ * So the inequality we wish to test is:
+ *   A_x + (Y - A_y) * A_dx / A_dy -?- X
+ * where -?- is our inequality operator.
+ *
+ * By construction, we know that A_dy (and (Y - A_y)) are
+ * all positive, so we can rearrange it thus without causing a sign change:
+ *   (Y - A_y) * A_dx -?- (X - A_x) * A_dy
+ *
+ * Given the assumption that all the deltas fit within 32 bits, we can compute
+ * this comparison directly using 64 bit arithmetic.
+ *
+ * See the similar discussion for _slope_compare() and
+ * edges_compare_x_for_y_general().
+ */
+static int
+edge_compare_for_y_against_x (const cairo_bo_edge_t *a,
+			      int32_t y,
+			      int32_t x)
+{
+    int32_t adx, ady;
+    int32_t dx, dy;
+    cairo_int64_t L, R;
+
+    adx = a->bottom.x - a->top.x;
+    ady = a->bottom.y - a->top.y;
+
+    dy = y - a->top.y;
+    dx = x - a->top.x;
+
+    L = _cairo_int32x32_64_mul (dy, adx);
+    R = _cairo_int32x32_64_mul (dx, ady);
+
+    return _cairo_int64_cmp (L, R);
+}
+
+static int
+edges_compare_x_for_y (const cairo_bo_edge_t *a,
+		       const cairo_bo_edge_t *b,
+		       int32_t y)
+{
+    /* If the sweep-line is currently on an end-point of a line,
+     * then we know its precise x value (and considering that we often need to
+     * compare events at end-points, this happens frequently enough to warrant
+     * special casing).
+     */
+    enum {
+       HAVE_NEITHER = 0x0,
+       HAVE_AX      = 0x1,
+       HAVE_BX      = 0x2,
+       HAVE_BOTH    = HAVE_AX | HAVE_BX
+    } have_ax_bx = HAVE_BOTH;
+    int32_t ax, bx;
+
+    if (y == a->top.y)
+	ax = a->top.x;
+    else if (y == a->bottom.y)
+	ax = a->bottom.x;
+    else
+	have_ax_bx &= ~HAVE_AX;
+
+    if (y == b->top.y)
+	bx = b->top.x;
+    else if (y == b->bottom.y)
+	bx = b->bottom.x;
+    else
+	have_ax_bx &= ~HAVE_BX;
+
+    switch (have_ax_bx) {
+    default:
+    case HAVE_NEITHER:
+	return edges_compare_x_for_y_general (a, b, y);
+    case HAVE_AX:
+	return - edge_compare_for_y_against_x (b, y, ax);
+    case HAVE_BX:
+	return edge_compare_for_y_against_x (a, y, bx);
+    case HAVE_BOTH:
+	return ax - bx;
     }
-    if (edge->bottom.y == y) {
-       quorem.quo = edge->bottom.x;
-       quorem.rem = 0;
-       return quorem;
-    }
-    if (dy == 0) {
-	quorem.quo = _cairo_int32_to_int64 (edge->top.x);
-	quorem.rem = 0;
-	return quorem;
-    }
-
-    /* edge->top.x + (y - edge->top.y) * dx / dy */
-    numerator = _cairo_int32x32_64_mul ((y - edge->top.y), dx);
-    quorem = _cairo_int64_divrem (numerator, dy);
-    quorem.quo += edge->top.x;
-
-    return quorem;
 }
 
 static int
 _cairo_bo_sweep_line_compare_edges (cairo_bo_sweep_line_t	*sweep_line,
 				    cairo_bo_edge_t		*a,
 				    cairo_bo_edge_t		*b)
 {
-    cairo_quorem64_t ax;
-    cairo_quorem64_t bx;
     int cmp;
 
     if (a == b)
 	return 0;
 
     /* don't bother solving for abscissa if the edges' bounding boxes
      * can be used to order them. */
     {
@@ -284,28 +388,19 @@ static int
            } else {
                    bmin = b->bottom.x;
                    bmax = b->middle.x;
            }
            if (amax < bmin) return -1;
            if (amin > bmax) return +1;
     }
 
-    ax = edge_x_for_y (a, sweep_line->current_y);
-    bx = edge_x_for_y (b, sweep_line->current_y);
-    if (ax.quo > bx.quo)
-	return 1;
-    else if (ax.quo < bx.quo)
-	return -1;
-
-    /* Quotients are identical, test remainder. */
-    if (ax.rem > bx.rem)
-	return 1;
-    else if (ax.rem < bx.rem)
-	return -1;
+    cmp = edges_compare_x_for_y (a, b, sweep_line->current_y);
+    if (cmp)
+	return cmp;
 
     /* The two edges intersect exactly at y, so fall back on slope
      * comparison. We know that this compare_edges function will be
      * called only when starting a new edge, (not when stopping an
      * edge), so we don't have to worry about conditionally inverting
      * the sense of _slope_compare. */
     cmp = _slope_compare (a, b);
     if (cmp)
@@ -484,27 +579,27 @@ det32_64 (int32_t a,
     /* det = a * d - b * c */
     ad = _cairo_int32x32_64_mul (a, d);
     bc = _cairo_int32x32_64_mul (b, c);
 
     return _cairo_int64_sub (ad, bc);
 }
 
 static inline cairo_int128_t
-det64_128 (cairo_int64_t a,
-	   cairo_int64_t b,
-	   cairo_int64_t c,
-	   cairo_int64_t d)
+det64x32_128 (cairo_int64_t a,
+	      int32_t       b,
+	      cairo_int64_t c,
+	      int32_t       d)
 {
     cairo_int128_t ad;
     cairo_int128_t bc;
 
     /* det = a * d - b * c */
-    ad = _cairo_int64x64_128_mul (a, d);
-    bc = _cairo_int64x64_128_mul (b, c);
+    ad = _cairo_int64x32_128_mul (a, d);
+    bc = _cairo_int64x32_128_mul (c, b);
 
     return _cairo_int128_sub (ad, bc);
 }
 
 /* Compute the intersection of two lines as defined by two edges. The
  * result is provided as a coordinate pair of 128-bit integers.
  *
  * Returns %CAIRO_BO_STATUS_INTERSECTION if there is an intersection or
@@ -527,41 +622,41 @@ intersect_lines (cairo_bo_edge_t		*a,
     int32_t dy1 = a->top.y - a->bottom.y;
 
     int32_t dx2 = b->top.x - b->bottom.x;
     int32_t dy2 = b->top.y - b->bottom.y;
 
     cairo_int64_t den_det = det32_64 (dx1, dy1, dx2, dy2);
     cairo_quorem64_t qr;
 
-    if (_cairo_int64_eq (den_det, 0))
+    if (_cairo_int64_is_zero (den_det))
 	return CAIRO_BO_STATUS_PARALLEL;
 
     a_det = det32_64 (a->top.x, a->top.y,
 		      a->bottom.x, a->bottom.y);
     b_det = det32_64 (b->top.x, b->top.y,
 		      b->bottom.x, b->bottom.y);
 
     /* x = det (a_det, dx1, b_det, dx2) / den_det */
-    qr = _cairo_int_96by64_32x64_divrem (det64_128 (a_det, dx1,
-						    b_det, dx2),
-					 den_det);
-    if (_cairo_int64_eq (qr.rem,den_det))
-	return CAIRO_BO_STATUS_NO_INTERSECTION;
-    intersection->x.ordinate = qr.quo;
-    intersection->x.exactness = qr.rem ? INEXACT : EXACT;
-
-    /* y = det (a_det, dy1, b_det, dy2) / den_det */
-    qr = _cairo_int_96by64_32x64_divrem (det64_128 (a_det, dy1,
-						    b_det, dy2),
+    qr = _cairo_int_96by64_32x64_divrem (det64x32_128 (a_det, dx1,
+						       b_det, dx2),
 					 den_det);
     if (_cairo_int64_eq (qr.rem, den_det))
 	return CAIRO_BO_STATUS_NO_INTERSECTION;
-    intersection->y.ordinate = qr.quo;
-    intersection->y.exactness = qr.rem ? INEXACT : EXACT;
+    intersection->x.ordinate = _cairo_int64_to_int32 (qr.quo);
+    intersection->x.exactness = _cairo_int64_is_zero (qr.rem) ? EXACT : INEXACT;
+
+    /* y = det (a_det, dy1, b_det, dy2) / den_det */
+    qr = _cairo_int_96by64_32x64_divrem (det64x32_128 (a_det, dy1,
+						       b_det, dy2),
+					 den_det);
+    if (_cairo_int64_eq (qr.rem, den_det))
+	return CAIRO_BO_STATUS_NO_INTERSECTION;
+    intersection->y.ordinate = _cairo_int64_to_int32 (qr.quo);
+    intersection->y.exactness = _cairo_int64_is_zero (qr.rem) ? EXACT : INEXACT;
 
     return CAIRO_BO_STATUS_INTERSECTION;
 }
 
 static int
 _cairo_bo_intersect_ordinate_32_compare (cairo_bo_intersect_ordinate_t	a,
 					 int32_t			b)
 {
@@ -936,17 +1031,16 @@ static void
 
     left->next = right->next;
     right->next = left;
 
     right->prev = left->prev;
     left->prev = right;
 }
 
-#define DEBUG_PRINT_STATE 0
 #if DEBUG_PRINT_STATE
 static void
 _cairo_bo_edge_print (cairo_bo_edge_t *edge)
 {
     printf ("(0x%x, 0x%x)-(0x%x, 0x%x)",
 	    edge->top.x, edge->top.y,
 	    edge->bottom.x, edge->bottom.y);
 }
@@ -1073,45 +1167,45 @@ static cairo_status_t
     if (right->bottom.y < bot)
 	bot = right->bottom.y;
 
     fixed_top = trap->top;
     fixed_bot = bot;
 
     /* Only emit trapezoids with positive height. */
     if (fixed_top < fixed_bot) {
-	cairo_point_t left_top, left_bot, right_top, right_bot;
+	cairo_line_t left_line;
+	cairo_line_t right_line;
 	cairo_fixed_t xmin = bo_traps->xmin;
 	cairo_fixed_t ymin = bo_traps->ymin;
 	fixed_top += ymin;
 	fixed_bot += ymin;
 
-	left_top.x = left->top.x + xmin;
-	left_top.y = left->top.y + ymin;
-	right_top.x = right->top.x + xmin;
-	right_top.y = right->top.y + ymin;
-	left_bot.x = left->bottom.x + xmin;
-	left_bot.y = left->bottom.y + ymin;
-	right_bot.x = right->bottom.x + xmin;
-	right_bot.y = right->bottom.y + ymin;
+	left_line.p1.x  = left->top.x + xmin;
+	left_line.p1.y  = left->top.y + ymin;
+	right_line.p1.x = right->top.x + xmin;
+	right_line.p1.y = right->top.y + ymin;
+
+	left_line.p2.x  = left->bottom.x + xmin;
+	left_line.p2.y  = left->bottom.y + ymin;
+	right_line.p2.x = right->bottom.x + xmin;
+	right_line.p2.y = right->bottom.y + ymin;
 
 	/* Avoid emitting the trapezoid if it is obviously degenerate.
 	 * TODO: need a real collinearity test here for the cases
 	 * where the trapezoid is degenerate, yet the top and bottom
 	 * coordinates aren't equal.  */
-	if (left_top.x != right_top.x ||
-	    left_top.y != right_top.y ||
-	    left_bot.x != right_bot.x ||
-	    left_bot.y != right_bot.y)
+	if (left_line.p1.x != right_line.p1.x ||
+	    left_line.p1.y != right_line.p1.y ||
+	    left_line.p2.x != right_line.p2.x ||
+	    left_line.p2.y != right_line.p2.y)
 	{
-	    _cairo_traps_add_trap_from_points (bo_traps->traps,
-					       fixed_top,
-					       fixed_bot,
-					       left_top, left_bot,
-					       right_top, right_bot);
+	    _cairo_traps_add_trap (bo_traps->traps,
+				   fixed_top, fixed_bot,
+				   &left_line, &right_line);
 
 #if DEBUG_PRINT_STATE
 	    printf ("Deferred trap: left=(%08x, %08x)-(%08x,%08x) "
 		    "right=(%08x,%08x)-(%08x,%08x) top=%08x, bot=%08x\n",
 		    left->top.x, left->top.y, left->bottom.x, left->bottom.y,
 		    right->top.x, right->top.y, right->bottom.x, right->bottom.y,
 		    trap->top, bot);
 #endif
@@ -1172,41 +1266,43 @@ static void
 }
 
 static void
 _cairo_bo_traps_fini (cairo_bo_traps_t *bo_traps)
 {
     _cairo_freelist_fini (&bo_traps->freelist);
 }
 
+#if DEBUG_VALIDATE
 static void
 _cairo_bo_sweep_line_validate (cairo_bo_sweep_line_t *sweep_line)
 {
     cairo_bo_edge_t *edge;
     skip_elt_t *elt;
 
     /* March through both the skip list's singly-linked list and the
      * sweep line's own list through pointers in the edges themselves
      * and make sure they agree at every point. */
 
     for (edge = sweep_line->head, elt = sweep_line->active_edges.chains[0];
 	 edge && elt;
 	 edge = edge->next, elt = elt->next[0])
     {
 	if (SKIP_ELT_TO_EDGE (elt) != edge) {
 	    fprintf (stderr, "*** Error: Sweep line fails to validate: Inconsistent data in the two lists.\n");
-	    exit (1);
+	    abort ();
 	}
     }
 
     if (edge || elt) {
 	fprintf (stderr, "*** Error: Sweep line fails to validate: One list ran out before the other.\n");
-	exit (1);
+	abort ();
     }
 }
+#endif
 
 
 static cairo_status_t
 _active_edges_to_traps (cairo_bo_edge_t		*head,
 			int32_t			 top,
 			cairo_fill_rule_t	 fill_rule,
 			cairo_bo_traps_t	*bo_traps)
 {
@@ -1319,19 +1415,18 @@ static cairo_status_t
 
 	    status = _cairo_bo_event_queue_insert_if_intersect_below_current_y (&event_queue, edge, right);
 	    if (status)
 		goto unwind;
 
 #if DEBUG_PRINT_STATE
 	    print_state ("After processing start", &event_queue, &sweep_line);
 #endif
-	    _cairo_bo_sweep_line_validate (&sweep_line);
+	    break;
 
-	    break;
 	case CAIRO_BO_EVENT_TYPE_STOP:
 	    edge = event->e1;
 
 	    left = edge->prev;
 	    right = edge->next;
 
 	    _cairo_bo_sweep_line_delete (&sweep_line, edge);
 
@@ -1341,19 +1436,18 @@ static cairo_status_t
 
 	    status = _cairo_bo_event_queue_insert_if_intersect_below_current_y (&event_queue, left, right);
 	    if (status)
 		goto unwind;
 
 #if DEBUG_PRINT_STATE
 	    print_state ("After processing stop", &event_queue, &sweep_line);
 #endif
-	    _cairo_bo_sweep_line_validate (&sweep_line);
+	    break;
 
-	    break;
 	case CAIRO_BO_EVENT_TYPE_INTERSECTION:
 	    edge1 = event->e1;
 	    edge2 = event->e2;
 
 	    /* skip this intersection if its edges are not adjacent */
 	    if (edge2 != edge1->next)
 		break;
 
@@ -1377,20 +1471,21 @@ static cairo_status_t
 	    status = _cairo_bo_event_queue_insert_if_intersect_below_current_y (&event_queue,
 								       edge1, right);
 	    if (status)
 		goto unwind;
 
 #if DEBUG_PRINT_STATE
 	    print_state ("After processing intersection", &event_queue, &sweep_line);
 #endif
-	    _cairo_bo_sweep_line_validate (&sweep_line);
-
 	    break;
 	}
+#if DEBUG_VALIDATE
+	_cairo_bo_sweep_line_validate (&sweep_line);
+#endif
     }
 
     *num_intersections = intersection_count;
  unwind:
     for (edge = sweep_line.head; edge; edge = edge->next) {
 	cairo_status_t status2 = _cairo_bo_edge_end_trap (edge,
 							  sweep_line.current_y,
 							  &bo_traps);
@@ -1422,22 +1517,26 @@ cairo_status_t
     int intersections;
     cairo_status_t status;
     cairo_bo_edge_t stack_edges[CAIRO_STACK_ARRAY_LENGTH (cairo_bo_edge_t)];
     cairo_bo_edge_t *edges;
     cairo_fixed_t xmin = 0x7FFFFFFF;
     cairo_fixed_t ymin = 0x7FFFFFFF;
     cairo_fixed_t xmax = -0x80000000;
     cairo_fixed_t ymax = -0x80000000;
+    cairo_box_t limit;
+    cairo_bool_t has_limits;
     int num_bo_edges;
     int i;
 
     if (0 == polygon->num_edges)
 	return CAIRO_STATUS_SUCCESS;
 
+    has_limits = _cairo_traps_get_limit (traps, &limit);
+
     if (polygon->num_edges < ARRAY_LENGTH (stack_edges)) {
 	edges = stack_edges;
     } else {
 	edges = _cairo_malloc_ab (polygon->num_edges, sizeof (cairo_bo_edge_t));
 	if (edges == NULL)
 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
     }
 
@@ -1466,16 +1565,23 @@ cairo_status_t
     if (ymax - ymin < 0)
 	ymax = ymin + 0x7FFFFFFF;
 
     for (i = 0, num_bo_edges = 0; i < polygon->num_edges; i++) {
 	cairo_bo_edge_t *edge = &edges[num_bo_edges];
 	cairo_point_t top = polygon->edges[i].edge.p1;
 	cairo_point_t bot = polygon->edges[i].edge.p2;
 
+	/* Discard the edge if it lies outside the limits of traps. */
+	if (has_limits) {
+	    /* Strictly above or below the limits? */
+	    if (bot.y <= limit.p1.y || top.y >= limit.p2.y)
+		continue;
+	}
+
 	/* Offset coordinates into the non-negative range. */
 	top.x -= xmin;
 	top.y -= ymin;
 	bot.x -= xmin;
 	bot.y -= ymin;
 
 	/* If the coordinates are still negative, then their extent is
 	 * overflowing 2^31-1.  We're going to kludge it and clamp the

--- a/gfx/cairo/cairo/src/cairo-cache.c
+++ b/gfx/cairo/cairo/src/cairo-cache.c
@@ -87,16 +87,17 @@ static void
     cache->size = 0;
 }
 
 /**
  * _cairo_cache_create:
  * @keys_equal: a function to return %TRUE if two keys are equal
  * @entry_destroy: destroy notifier for cache entries
  * @max_size: the maximum size for this cache
+ * Returns: the newly created #cairo_cache_t
  *
  * Creates a new cache using the keys_equal() function to determine
  * the equality of entries.
  *
  * Data is provided to the cache in the form of user-derived version
  * of #cairo_cache_entry_t. A cache entry must be able to hold hash
  * code, a size, and the key/value pair being stored in the
  * cache. Sometimes only the key will be necessary, (as in
@@ -114,18 +115,16 @@ static void
  * undesired. If the cache entries have reference counts, then it is a
  * simple matter to use the reference counts to ensure that entries
  * continue to live even after being ejected from the cache. However,
  * in some cases the memory overhead of adding a reference count to
  * the entry would be objectionable. In such cases, the
  * _cairo_cache_freeze() and _cairo_cache_thaw() calls can be
  * used to establish a window during which no automatic removal of
  * entries will occur.
- *
- * Return value:
  **/
 cairo_cache_t *
 _cairo_cache_create (cairo_cache_keys_equal_func_t keys_equal,
 		     cairo_destroy_func_t	   entry_destroy,
 		     unsigned long		   max_size)
 {
     cairo_status_t status;
     cairo_cache_t *cache;

--- a/gfx/cairo/cairo/src/cairo-clip.c
+++ b/gfx/cairo/cairo/src/cairo-clip.c
@@ -143,33 +143,36 @@ static cairo_status_t
 				         cairo_rectangle_int_t   *rectangle)
 {
     while (clip_path) {
         cairo_status_t status;
         cairo_traps_t traps;
         cairo_box_t extents;
         cairo_rectangle_int_t extents_rect;
 
+	_cairo_box_from_rectangle (&extents, rectangle);
+
         _cairo_traps_init (&traps);
+	_cairo_traps_limit (&traps, &extents);
 
         status = _cairo_path_fixed_fill_to_traps (&clip_path->path,
                                                   clip_path->fill_rule,
                                                   clip_path->tolerance,
                                                   &traps);
         if (status) {
             _cairo_traps_fini (&traps);
             return status;
         }
 
         _cairo_traps_extents (&traps, &extents);
+        _cairo_traps_fini (&traps);
+
         _cairo_box_round_to_rectangle (&extents, &extents_rect);
         _cairo_rectangle_intersect (rectangle, &extents_rect);
 
-        _cairo_traps_fini (&traps);
-
         clip_path = clip_path->prev;
     }
 
     return CAIRO_STATUS_SUCCESS;
 }
 
 cairo_status_t
 _cairo_clip_intersect_to_rectangle (cairo_clip_t            *clip,
@@ -431,19 +434,18 @@ static cairo_status_t
     _cairo_traps_extents (traps, &extents);
     _cairo_box_round_to_rectangle (&extents, &surface_rect);
 
     if (clip->surface != NULL)
 	_cairo_rectangle_intersect (&surface_rect, &clip->surface_rect);
 
     /* Intersect with the target surface rectangle so we don't use
      * more memory and time than we need to. */
-
     status = _cairo_surface_get_extents (target, &target_rect);
-    if (!status)
+    if (status == CAIRO_STATUS_SUCCESS)
 	_cairo_rectangle_intersect (&surface_rect, &target_rect);
 
     if (surface_rect.width == 0 || surface_rect.height == 0) {
 	surface = NULL;
 	status = CAIRO_STATUS_SUCCESS;
 	if (clip->surface != NULL)
 	    cairo_surface_destroy (clip->surface);
 	goto DONE;
@@ -556,16 +558,17 @@ cairo_status_t
 _cairo_clip_clip (cairo_clip_t       *clip,
 		  cairo_path_fixed_t *path,
 		  cairo_fill_rule_t   fill_rule,
 		  double              tolerance,
 		  cairo_antialias_t   antialias,
 		  cairo_surface_t    *target)
 {
     cairo_status_t status;
+    cairo_rectangle_int_t rectangle;
     cairo_traps_t traps;
 
     if (clip->all_clipped)
 	return CAIRO_STATUS_SUCCESS;
 
     /* catch the empty clip path */
     if (! path->has_current_point) {
 	_cairo_clip_set_all_clipped (clip, target);
@@ -577,16 +580,27 @@ cairo_status_t
 					 antialias);
     if (status == CAIRO_STATUS_SUCCESS)
         clip->serial = _cairo_surface_allocate_clip_serial (target);
 
     if (status != CAIRO_INT_STATUS_UNSUPPORTED)
 	return status;
 
     _cairo_traps_init (&traps);
+
+    /* Limit the traps to the target surface
+     * - so we don't add more traps than needed. */
+    status = _cairo_surface_get_extents (target, &rectangle);
+    if (status == CAIRO_STATUS_SUCCESS) {
+	cairo_box_t box;
+
+	_cairo_box_from_rectangle (&box, &rectangle);
+	_cairo_traps_limit (&traps, &box);
+    }
+
     status = _cairo_path_fixed_fill_to_traps (path,
 					      fill_rule,
 					      tolerance,
 					      &traps);
     if (status)
 	goto bail;
 
     status = _cairo_clip_intersect_region (clip, &traps, target);
@@ -671,26 +685,32 @@ cairo_status_t
             status = _cairo_region_copy (&clip->region, &other->region);
 	    if (status)
 		goto BAIL;
 
 	    clip->has_region = TRUE;
         }
 
         if (other->surface) {
+	    int dx, dy;
             status = _cairo_surface_clone_similar (target, other->surface,
 					           0,
 						   0,
 						   other->surface_rect.width,
 						   other->surface_rect.height,
+						   &dx, &dy,
 						   &clip->surface);
 	    if (status)
 		goto BAIL;
 
             clip->surface_rect = other->surface_rect;
+
+	    /* src offset was 0, so we expect an exact replica of the surface */
+	    assert (dx == 0);
+	    assert (dy == 0);
         }
 
         if (other->path) {
             status = _cairo_clip_path_reapply_clip_path (clip, other->path);
 	    if (status && status != CAIRO_INT_STATUS_UNSUPPORTED)
 		goto BAIL;
         }
     }

--- a/gfx/cairo/cairo/src/cairo-color.c
+++ b/gfx/cairo/cairo/src/cairo-color.c
@@ -160,13 +160,16 @@ void
     *blue  = color->blue  * color->alpha;
     *alpha = color->alpha;
 }
 
 cairo_bool_t
 _cairo_color_equal (const cairo_color_t *color_a,
 	            const cairo_color_t *color_b)
 {
+    if (color_a == color_b)
+	return TRUE;
+
     return color_a->red_short   == color_b->red_short   &&
            color_a->green_short == color_b->green_short &&
            color_a->blue_short  == color_b->blue_short  &&
            color_a->alpha_short == color_b->alpha_short;
 }

--- a/gfx/cairo/cairo/src/cairo-compiler-private.h
+++ b/gfx/cairo/cairo/src/cairo-compiler-private.h
@@ -33,16 +33,18 @@
  *
  * Contributor(s):
  *	Carl D. Worth <cworth@cworth.org>
  */
 
 #ifndef CAIRO_COMPILER_PRIVATE_H
 #define CAIRO_COMPILER_PRIVATE_H
 
+#include "cairo.h"
+
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun)
 # define slim_hidden_proto(name)		slim_hidden_proto1(name, slim_hidden_int_name(name)) cairo_private
 # define slim_hidden_proto_no_warn(name)	slim_hidden_proto1(name, slim_hidden_int_name(name)) cairo_private_no_warn
 # define slim_hidden_def(name)			slim_hidden_def1(name, slim_hidden_int_name(name))
@@ -104,23 +106,52 @@
 # define CAIRO_FUNCTION_ALIAS(old, new)		\
 	extern __typeof (new) old		\
 	__asm__ ("" #old)			\
 	__attribute__((__alias__("" #new)))
 #else
 # define CAIRO_FUNCTION_ALIAS(old, new)
 #endif
 
+/*
+ * Cairo uses the following function attributes in order to improve the
+ * generated code (effectively by manual inter-procedural analysis).
+ *
+ *   'cairo_pure': The function is only allowed to read from its arguments
+ *                 and global memory (i.e. following a pointer argument or
+ *                 accessing a shared variable). The return value should
+ *                 only depend on its arguments, and for an identical set of
+ *                 arguments should return the same value.
+ *
+ *   'cairo_const': The function is only allowed to read from its arguments.
+ *                  It is not allowed to access global memory. The return
+ *                  value should only depend its arguments, and for an
+ *                  identical set of arguments should return the same value.
+ *                  This is currently the most strict function attribute.
+ *
+ * Both these function attributes allow gcc to perform CSE and
+ * constant-folding, with 'cairo_const 'also guaranteeing that pointer contents
+ * do not change across the function call.
+ */
+#if __GNUC__ >= 3
+#define cairo_pure __attribute__((pure))
+#define cairo_const __attribute__((const))
+#else
+#define cairo_pure
+#define cairo_const
+#endif
+
 #ifndef __GNUC__
 #undef __attribute__
 #define __attribute__(x)
 #endif
 
 #if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER)
 #define snprintf _snprintf
+#define popen _popen
 #endif
 
 #ifdef _MSC_VER
 #undef inline
 #define inline __inline
 #endif
 
 #ifdef __STRICT_ANSI__

--- a/gfx/cairo/cairo/src/cairo-directfb-surface.c
+++ b/gfx/cairo/cairo/src/cairo-directfb-surface.c
@@ -29,109 +29,103 @@
  *
  * The Initial Developer of the Original Code is University of Southern
  * California.
  *
  * Contributor(s):
  *    Michael Emmel <mike.emmel@gmail.com>
  *    Claudio Ciccani <klan@users.sf.net>
  */
- 
 
 #include "cairoint.h"
 #include "cairo-directfb.h"
 
-#include <stdlib.h>
-
 #include <directfb.h>
 #include <direct/types.h>
 #include <direct/debug.h>
 #include <direct/memcpy.h>
 #include <direct/util.h>
 
+#include "cairo-clip-private.h"
 
 /*
  * Rectangle works fine.
  * Bugs 361377, 359553, 359243 in Gnome BTS are caused
  * by GDK/DirectFB, not by Cairo/DirectFB.
  */
 #define DFB_RECTANGLES 1
 
 /*
  * Composite works fine.
  */
-#define DFB_COMPOSITE 1 
+#define DFB_COMPOSITE 1
 
 /*
  * CompositeTrapezoids works (without antialiasing).
  */
 #define DFB_COMPOSITE_TRAPEZOIDS 1
 
 /*
  * ShowGlyphs works fine.
  */
 #define DFB_SHOW_GLYPHS 1
 
 
-D_DEBUG_DOMAIN( CairoDFB_Acquire, "CairoDFB/Acquire", "Cairo DirectFB Acquire" );
-D_DEBUG_DOMAIN( CairoDFB_Clip,    "CairoDFB/Clip",    "Cairo DirectFB Clipping" );
-D_DEBUG_DOMAIN( CairoDFB_Font,    "CairoDFB/Font",    "Cairo DirectFB Font Rendering" );
-D_DEBUG_DOMAIN( CairoDFB_Render,  "CairoDFB/Render",  "Cairo DirectFB Rendering" );
-D_DEBUG_DOMAIN( CairoDFB_Surface, "CairoDFB/Surface", "Cairo DirectFB Surface" );
+D_DEBUG_DOMAIN (CairoDFB_Acquire, "CairoDFB/Acquire", "Cairo DirectFB Acquire");
+D_DEBUG_DOMAIN (CairoDFB_Clip,    "CairoDFB/Clip",    "Cairo DirectFB Clipping");
+D_DEBUG_DOMAIN (CairoDFB_Font,    "CairoDFB/Font",    "Cairo DirectFB Font Rendering");
+D_DEBUG_DOMAIN (CairoDFB_Render,  "CairoDFB/Render",  "Cairo DirectFB Rendering");
+D_DEBUG_DOMAIN (CairoDFB_Surface, "CairoDFB/Surface", "Cairo DirectFB Surface");
 
 /*****************************************************************************/
 
-
 typedef struct _cairo_directfb_surface {
     cairo_surface_t      base;
     cairo_format_t       format;
     cairo_content_t      content;
-    
+
     IDirectFB           *dfb;
     IDirectFBSurface    *dfbsurface;
     IDirectFBSurface    *tmpsurface;
-    
-    /* color buffer */
-    cairo_surface_t     *color;
-        
+
+    cairo_bool_t         has_clip;
     DFBRegion           *clips;
     int                  n_clips;
-    
+
     int                  width;
     int                  height;
-    
-    cairo_bool_t         local;
+
+    unsigned             local : 1;
+    unsigned             blit_premultiplied : 1;
 } cairo_directfb_surface_t;
 
 
 typedef struct _cairo_directfb_font_cache {
-    IDirectFB           *dfb; 
+    IDirectFB           *dfb;
     IDirectFBSurface    *dfbsurface;
 
     int                  width;
     int                  height;
 
-    /* coordinates within the surface 
+    /* coordinates within the surface
      * of the last loaded glyph */
     int                  x;
     int                  y;
 } cairo_directfb_font_cache_t;
-    
 
-static cairo_surface_backend_t cairo_directfb_surface_backend;
+static cairo_surface_backend_t _cairo_directfb_surface_backend;
 
 /*****************************************************************************/
 
 static int _directfb_argb_font = 0;
 
 /*****************************************************************************/
 
-
-#define RUN_CLIPPED( surface, clip, func ) {\
-    if ((surface)->clips) {\
+#define RUN_CLIPPED(surface, clip, func) {\
+    if ((surface)->has_clip) {\
         int k;\
         for (k = 0; k < (surface)->n_clips; k++) {\
             if (clip) {\
                 DFBRegion  reg = (surface)->clips[k];\
                 DFBRegion *cli = (clip);\
                 if (reg.x2 < cli->x1 || reg.y2 < cli->y1 ||\
                     reg.x1 > cli->x2 || reg.y1 > cli->y2)\
                     continue;\
@@ -139,909 +133,957 @@ static int _directfb_argb_font = 0;
                     reg.x1 = cli->x1;\
                 if (reg.y1 < cli->y1)\
                     reg.y1 = cli->y1;\
                 if (reg.x2 > cli->x2)\
                     reg.x2 = cli->x2;\
                 if (reg.y2 > cli->y2)\
                     reg.y2 = cli->y2;\
                 (surface)->dfbsurface->SetClip ((surface)->dfbsurface, &reg);\
-            }\
-            else {\
+            } else {\
                 (surface)->dfbsurface->SetClip ((surface)->dfbsurface,\
                                            &(surface)->clips[k]);\
             }\
             func;\
         }\
-    }\
-    else {\
+    } else {\
         (surface)->dfbsurface->SetClip ((surface)->dfbsurface, clip);\
         func;\
     }\
 }
 
-#define TRANSFORM_POINT2X( m, x, y, ret_x, ret_y ) {\
+#define TRANSFORM_POINT2X(m, x, y, ret_x, ret_y) {\
     double _x = (x);\
     double _y = (y);\
     (ret_x) = (_x * (m).xx + (m).x0);\
     (ret_y) = (_y * (m).yy + (m).y0);\
 }
 
-#define TRANSFORM_POINT3X( m, x, y, ret_x, ret_y ) {\
+#define TRANSFORM_POINT3X(m, x, y, ret_x, ret_y) {\
     double _x = (x);\
     double _y = (y);\
     (ret_x) = (_x * (m).xx + _y * (m).xy + (m).x0);\
     (ret_y) = (_x * (m).yx + _y * (m).yy + (m).y0);\
 }
 
 /* XXX: A1 has a different bits ordering in cairo.
  *      Probably we should drop it.
  */
 
-static cairo_content_t 
+static cairo_content_t
 _directfb_format_to_content (DFBSurfacePixelFormat format)
 {
-    if (DFB_PIXELFORMAT_HAS_ALPHA(format)) {
-        if (DFB_COLOR_BITS_PER_PIXEL(format))
+    if (DFB_PIXELFORMAT_HAS_ALPHA (format)) {
+        if (DFB_COLOR_BITS_PER_PIXEL (format))
             return CAIRO_CONTENT_COLOR_ALPHA;
-            
+
         return CAIRO_CONTENT_ALPHA;
     }
-    
+
     return CAIRO_CONTENT_COLOR;
 }
 
-                                                           
-static inline DFBSurfacePixelFormat 
+static inline DFBSurfacePixelFormat
 _cairo_to_directfb_format (cairo_format_t format)
 {
     switch (format) {
-        case CAIRO_FORMAT_RGB24:
-            return DSPF_RGB32;
-        case CAIRO_FORMAT_ARGB32:
-            return DSPF_ARGB; 
-        case CAIRO_FORMAT_A8:
-            return DSPF_A8; 
-        case CAIRO_FORMAT_A1:
-            return DSPF_A1; 
-        default:
-            break;
+    case CAIRO_FORMAT_RGB24:
+	return DSPF_RGB32;
+    case CAIRO_FORMAT_ARGB32:
+	return DSPF_ARGB;
+    case CAIRO_FORMAT_A8:
+	return DSPF_A8;
+    case CAIRO_FORMAT_A1:
+	return DSPF_A1;
+    default:
+	break;
     }
-    
+
     return -1;
 }
 
 static inline cairo_format_t
 _directfb_to_cairo_format (DFBSurfacePixelFormat format)
 {
     switch (format) {
-        case DSPF_RGB32:
-            return CAIRO_FORMAT_RGB24;
-        case DSPF_ARGB:
-            return CAIRO_FORMAT_ARGB32;
-        case DSPF_A8:
-            return CAIRO_FORMAT_A8;
-        case DSPF_A1:
-            return CAIRO_FORMAT_A1;
-        default:
-            break;
+    case DSPF_RGB32:
+	return CAIRO_FORMAT_RGB24;
+    case DSPF_ARGB:
+	return CAIRO_FORMAT_ARGB32;
+    case DSPF_A8:
+	return CAIRO_FORMAT_A8;
+    case DSPF_A1:
+	return CAIRO_FORMAT_A1;
+    default:
+	break;
     }
-    
+
     return -1;
 }
 
-
-static cairo_status_t
+static cairo_bool_t
 _directfb_get_operator (cairo_operator_t         operator,
                         DFBSurfaceBlendFunction *ret_srcblend,
-                        DFBSurfaceBlendFunction *ret_dstblend )
+                        DFBSurfaceBlendFunction *ret_dstblend)
 {
     DFBSurfaceBlendFunction srcblend = DSBF_ONE;
     DFBSurfaceBlendFunction dstblend = DSBF_ZERO;
-    
+
     switch (operator) {
-        case CAIRO_OPERATOR_CLEAR:
-            srcblend = DSBF_ZERO;
-            dstblend = DSBF_ZERO;
-            break;
-        case CAIRO_OPERATOR_SOURCE:
-            srcblend = DSBF_ONE;
-            dstblend = DSBF_ZERO;
-            break;
-        case CAIRO_OPERATOR_OVER:
-            srcblend = DSBF_ONE;
-            dstblend = DSBF_INVSRCALPHA;
-            break;
-        case CAIRO_OPERATOR_IN:
-            srcblend = DSBF_DESTALPHA;
-            dstblend = DSBF_ZERO;
-            break;
-        case CAIRO_OPERATOR_OUT:
-            srcblend = DSBF_INVDESTALPHA;
-            dstblend = DSBF_ZERO;
-            break;
-        case CAIRO_OPERATOR_ATOP:
-            srcblend = DSBF_DESTALPHA;
-            dstblend = DSBF_INVSRCALPHA;
-            break;
-        case CAIRO_OPERATOR_DEST:
-            srcblend = DSBF_ZERO;
-            dstblend = DSBF_ONE;
-            break;
-        case CAIRO_OPERATOR_DEST_OVER:
-            srcblend = DSBF_INVDESTALPHA;
-            dstblend = DSBF_ONE;
-            break;
-        case CAIRO_OPERATOR_DEST_IN:
-            srcblend = DSBF_ZERO;
-            dstblend = DSBF_SRCALPHA;
-            break;
-        case CAIRO_OPERATOR_DEST_OUT:
-            srcblend = DSBF_ZERO;
-            dstblend = DSBF_INVSRCALPHA;
-            break;
-        case CAIRO_OPERATOR_DEST_ATOP:
-            srcblend = DSBF_INVDESTALPHA;
-            dstblend = DSBF_SRCALPHA;
-            break;                        
-        case CAIRO_OPERATOR_XOR:
-            srcblend = DSBF_INVDESTALPHA;
-            dstblend = DSBF_INVSRCALPHA;
-            break;
-        case CAIRO_OPERATOR_ADD:
-            srcblend = DSBF_ONE;
-            dstblend = DSBF_ONE;
-            break;
-        case CAIRO_OPERATOR_SATURATE:
-            srcblend = DSBF_SRCALPHASAT;
-            dstblend = DSBF_ONE;
-            break;
-        default:
-            return CAIRO_INT_STATUS_UNSUPPORTED;
+    case CAIRO_OPERATOR_CLEAR:
+	srcblend = DSBF_ZERO;
+	dstblend = DSBF_ZERO;
+	break;
+    case CAIRO_OPERATOR_SOURCE:
+	srcblend = DSBF_ONE;
+	dstblend = DSBF_ZERO;
+	break;
+    case CAIRO_OPERATOR_OVER:
+	srcblend = DSBF_ONE;
+	dstblend = DSBF_INVSRCALPHA;
+	break;
+    case CAIRO_OPERATOR_IN:
+	srcblend = DSBF_DESTALPHA;
+	dstblend = DSBF_ZERO;
+	break;
+    case CAIRO_OPERATOR_OUT:
+	srcblend = DSBF_INVDESTALPHA;
+	dstblend = DSBF_ZERO;
+	break;
+    case CAIRO_OPERATOR_ATOP:
+	srcblend = DSBF_DESTALPHA;
+	dstblend = DSBF_INVSRCALPHA;
+	break;
+    case CAIRO_OPERATOR_DEST:
+	srcblend = DSBF_ZERO;
+	dstblend = DSBF_ONE;
+	break;
+    case CAIRO_OPERATOR_DEST_OVER:
+	srcblend = DSBF_INVDESTALPHA;
+	dstblend = DSBF_ONE;
+	break;
+    case CAIRO_OPERATOR_DEST_IN:
+	srcblend = DSBF_ZERO;
+	dstblend = DSBF_SRCALPHA;
+	break;
+    case CAIRO_OPERATOR_DEST_OUT:
+	srcblend = DSBF_ZERO;
+	dstblend = DSBF_INVSRCALPHA;
+	break;
+    case CAIRO_OPERATOR_DEST_ATOP:
+	srcblend = DSBF_INVDESTALPHA;
+	dstblend = DSBF_SRCALPHA;
+	break;
+    case CAIRO_OPERATOR_XOR:
+	srcblend = DSBF_INVDESTALPHA;
+	dstblend = DSBF_INVSRCALPHA;
+	break;
+    case CAIRO_OPERATOR_ADD:
+	srcblend = DSBF_ONE;
+	dstblend = DSBF_ONE;
+	break;
+    case CAIRO_OPERATOR_SATURATE:
+	/* XXX This does not work. */
+#if 0
+	srcblend = DSBF_SRCALPHASAT;
+	dstblend = DSBF_ONE;
+	break;
+#endif
+    default:
+	return FALSE;
     }
 
-    if (ret_srcblend)
-        *ret_srcblend = srcblend;
-    if (ret_dstblend)
-        *ret_dstblend = dstblend;
-    
-    return CAIRO_STATUS_SUCCESS;
+    *ret_srcblend = srcblend;
+    *ret_dstblend = dstblend;
+
+    return TRUE;
 }
 
-static IDirectFBSurface*
-_directfb_buffer_surface_create (IDirectFB             *dfb, 
+static cairo_status_t
+_directfb_buffer_surface_create (IDirectFB             *dfb,
                                  DFBSurfacePixelFormat  format,
                                  int                    width,
-                                 int                    height)
+                                 int                    height,
+				 IDirectFBSurface     **out)
 {
     IDirectFBSurface      *buffer;
     DFBSurfaceDescription  dsc;
     DFBResult              ret;
-    
+
     dsc.flags       = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT;
+    dsc.caps        = DSCAPS_PREMULTIPLIED;
     dsc.width       = width;
     dsc.height      = height;
     dsc.pixelformat = format;
 
     ret = dfb->CreateSurface (dfb, &dsc, &buffer);
     if (ret) {
         DirectFBError ("IDirectFB::CreateSurface()", ret);
-        return NULL;
+	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
     }
-    
-    return buffer;
+
+    *out = buffer;
+    return CAIRO_STATUS_SUCCESS;
 }
 
 static cairo_status_t
-_directfb_acquire_surface (cairo_directfb_surface_t  *surface, 
+_directfb_acquire_surface (cairo_directfb_surface_t  *surface,
                            cairo_rectangle_int_t     *intrest_rec,
                            cairo_image_surface_t    **image_out,
                            cairo_rectangle_int_t     *image_rect_out,
                            void                     **image_extra,
                            DFBSurfaceLockFlags        lock_flags)
-{   
+{
     IDirectFBSurface *buffer = NULL;
     DFBRectangle source_rect;
+    cairo_surface_t *image;
     cairo_format_t cairo_format;
+    cairo_status_t status;
     void *data;
-    int   pitch; 
+    int   pitch;
 
-    if (surface->format == (cairo_format_t) -1) {
+    if (surface->format == (cairo_format_t) -1 ||
+	(lock_flags & DSLF_WRITE && surface->has_clip))
+    {
         DFBSurfaceCapabilities caps;
-        
+
         if (intrest_rec) {
             source_rect.x = intrest_rec->x;
             source_rect.y = intrest_rec->y;
-            source_rect.w = intrest_rec->width; 
-            source_rect.h = intrest_rec->height; 
+            source_rect.w = intrest_rec->width;
+            source_rect.h = intrest_rec->height;
         } else {
             source_rect.x = 0;
             source_rect.y = 0;
             surface->dfbsurface->GetSize (surface->dfbsurface,
-                                          &source_rect.w, &source_rect.h);   
+                                          &source_rect.w, &source_rect.h);
         }
 
         if (surface->tmpsurface) {
             int w, h;
             surface->tmpsurface->GetSize (surface->tmpsurface, &w, &h);
             if (w < source_rect.w || h < source_rect.h) {
                 surface->tmpsurface->Release (surface->tmpsurface);
                 surface->tmpsurface = NULL;
             }
         }
-        
+
         cairo_format = _cairo_format_from_content (surface->content);
         if (!surface->tmpsurface) {
             D_DEBUG_AT (CairoDFB_Acquire, "Allocating buffer for surface %p.\n", surface);
-       
-            surface->tmpsurface = 
-                _directfb_buffer_surface_create (surface->dfb, 
+
+            status =
+                _directfb_buffer_surface_create (surface->dfb,
                                                  _cairo_to_directfb_format (cairo_format),
-                                                 source_rect.w, source_rect.h);
-            if (!surface->tmpsurface)
+                                                 source_rect.w, source_rect.h,
+						 &surface->tmpsurface);
+            if (status)
                 goto ERROR;
         }
         buffer = surface->tmpsurface;
-        
+
 /*        surface->dfbsurface->GetCapabilities (surface->dfbsurface, &caps);
         if (caps & DSCAPS_FLIPPING) {
-            DFBRegion region = { .x1 = source_rect.x, .y1 = source_rect.y, 
+            DFBRegion region = { .x1 = source_rect.x, .y1 = source_rect.y,
                                  .x2 = source_rect.x + source_rect.w - 1,
                                  .y2 = source_rect.y + source_rect.h - 1 };
             surface->dfbsurface->Flip (surface->dfbsurface, &region, DSFLIP_BLIT);
         } */
         buffer->Blit (buffer, surface->dfbsurface, &source_rect, 0, 0);
-    }
-    else {
+    } else {
         /*might be a subsurface get the offset*/
         surface->dfbsurface->GetVisibleRectangle (surface->dfbsurface, &source_rect);
         cairo_format = surface->format;
-        buffer = surface->dfbsurface;     
+        buffer = surface->dfbsurface;
     }
-    
-    *image_extra = buffer;
-    
+
     if (buffer->Lock (buffer, lock_flags, &data, &pitch)) {
         D_DEBUG_AT (CairoDFB_Acquire, "Couldn't lock surface!\n");
+	status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
         goto ERROR;
     }
-            
-    *image_out = (cairo_image_surface_t *)
-                    cairo_image_surface_create_for_data (data, cairo_format,
-                                            source_rect.w, source_rect.h, pitch);
-    if (*image_out == NULL) 
+
+    image = cairo_image_surface_create_for_data (data, cairo_format,
+						 source_rect.w, source_rect.h,
+						 pitch);
+    status = image->status;
+    if (status)
         goto ERROR;
 
     if (image_rect_out) {
         image_rect_out->x = source_rect.x;
         image_rect_out->y = source_rect.y;
         image_rect_out->width = source_rect.w;
         image_rect_out->height = source_rect.h;
     } else {
         /* lock for read */
-        cairo_surface_t *sur = &((*image_out)->base); 
         /* might be a subsurface */
-        if (buffer == surface->dfbsurface)
-            cairo_surface_set_device_offset (sur, source_rect.x, source_rect.y);
+        if (buffer == surface->dfbsurface) {
+            cairo_surface_set_device_offset (image,
+					     source_rect.x, source_rect.y);
+	}
     }
-   
+
+    *image_extra = buffer;
+    *image_out = (cairo_image_surface_t *) image;
     return CAIRO_STATUS_SUCCESS;
 
 ERROR:
-    *image_extra = NULL;
     if (buffer) {
         buffer->Unlock (buffer);
-        if (buffer != surface->dfbsurface) 
+        if (buffer != surface->dfbsurface)
             buffer->Release (buffer);
     }
-    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+    return status;
 }
 
-
-
 static cairo_surface_t *
 _cairo_directfb_surface_create_similar (void            *abstract_src,
                                         cairo_content_t  content,
                                         int              width,
                                         int              height)
 {
     cairo_directfb_surface_t *source  = abstract_src;
     cairo_directfb_surface_t *surface;
     cairo_format_t            format;
-    
-    D_DEBUG_AT (CairoDFB_Surface, 
+    cairo_status_t	      status;
+
+    D_DEBUG_AT (CairoDFB_Surface,
                 "%s( src=%p, content=0x%x, width=%d, height=%d).\n",
                 __FUNCTION__, source, content, width, height);
-    
+
     width = (width <= 0) ? 1 : width;
     height = (height<= 0) ? 1 : height;
 
-    format = _cairo_format_from_content (content);             
-    surface = calloc (1, sizeof(cairo_directfb_surface_t));
-    if (!surface) {
-        _cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
-        return NULL;
-    }
-   
+    format = _cairo_format_from_content (content);
+    surface = calloc (1, sizeof (cairo_directfb_surface_t));
+    if (surface == NULL)
+	return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
+
     surface->dfb = source->dfb;
-    
+
     if (width < 8 || height < 8) {
         IDirectFBSurface *tmp;
+	DFBRectangle rect = { .x=0, .y=0, .w=width, .h=height };
+
         /* Some cards (e.g. Matrox) don't support surfaces smaller than 8x8 */
-        tmp =  _directfb_buffer_surface_create (surface->dfb, 
+        status =  _directfb_buffer_surface_create (surface->dfb,
                                         _cairo_to_directfb_format (format),
-                                        MAX (width, 8), MAX (height, 8));
-        if (tmp) {
-            DFBRectangle rect = { .x=0, .y=0, .w=width, .h=height };
-            tmp->GetSubSurface (tmp, &rect, &surface->dfbsurface);
-            tmp->Release (tmp);
-        }
+                                        MAX (width, 8), MAX (height, 8),
+					&tmp);
+	if (status) {
+	    free (surface);
+	    return _cairo_surface_create_in_error (status);
+	}
+
+	tmp->GetSubSurface (tmp, &rect, &surface->dfbsurface);
+	tmp->Release (tmp);
+    } else {
+	status =
+	    _directfb_buffer_surface_create (surface->dfb,
+					     _cairo_to_directfb_format (format),
+					     width, height,
+					     &surface->dfbsurface);
+	if (status) {
+	    free (surface);
+	    return _cairo_surface_create_in_error (status);
+	}
     }
-    else {
-        surface->dfbsurface = _directfb_buffer_surface_create (surface->dfb,
-                                    _cairo_to_directfb_format (format), width, height);
-    }
-    
-    if (!surface->dfbsurface) {
-        D_ASSERT (surface->dfbsurface != NULL);
-        free (surface);
-        return NULL;
-    }
-    
-    _cairo_surface_init (&surface->base, &cairo_directfb_surface_backend, content);
+
+    _cairo_surface_init (&surface->base,
+			 &_cairo_directfb_surface_backend,
+			 content);
     surface->format  = format;
     surface->content = content;
     surface->width   = width;
     surface->height  = height;
-    surface->local   = true;
-    
+    surface->local   = TRUE;
+    surface->blit_premultiplied = TRUE;
+
     return &surface->base;
 }
 
 static cairo_status_t
 _cairo_directfb_surface_finish (void *data)
 {
     cairo_directfb_surface_t *surface = (cairo_directfb_surface_t *)data;
-    
+
     D_DEBUG_AT (CairoDFB_Surface, "%s( surface=%p ).\n", __FUNCTION__, surface);
-        
+
     if (surface->clips) {
         free (surface->clips);
         surface->clips   = NULL;
         surface->n_clips = 0;
     }
-    
-    if (surface->color) {
-        cairo_surface_destroy (surface->color);
-        surface->color = NULL;
-    }
-    
+
     if (surface->tmpsurface) {
         surface->tmpsurface->Release (surface->tmpsurface);
         surface->tmpsurface = NULL;
     }
 
     if (surface->dfbsurface) {
         surface->dfbsurface->Release (surface->dfbsurface);
         surface->dfbsurface = NULL;
     }
-    
+
     if (surface->dfb)
         surface->dfb = NULL;
-        
+
     return CAIRO_STATUS_SUCCESS;
 }
 
 static cairo_status_t
 _cairo_directfb_surface_acquire_source_image (void                   *abstract_surface,
                                               cairo_image_surface_t **image_out,
                                               void                  **image_extra)
 {
     cairo_directfb_surface_t *surface = abstract_surface;
-    
-    D_DEBUG_AT (CairoDFB_Acquire, 
-                "%s( surface=%p ).\n", __FUNCTION__, surface);
-    
-    return _directfb_acquire_surface (surface, NULL, image_out, 
-                                      NULL, image_extra, DSLF_READ);
+
+    D_DEBUG_AT (CairoDFB_Acquire,
+		"%s( surface=%p ).\n", __FUNCTION__, surface);
+
+    return _directfb_acquire_surface (surface, NULL, image_out,
+				      NULL, image_extra, DSLF_READ);
 }
 
 static void
 _cairo_directfb_surface_release_source_image (void                  *abstract_surface,
                                               cairo_image_surface_t *image,
                                               void                  *image_extra)
 {
-    cairo_directfb_surface_t *surface = abstract_surface;
     IDirectFBSurface *buffer = image_extra;
-    
-    D_DEBUG_AT (CairoDFB_Acquire, 
-                "%s( surface=%p ).\n", __FUNCTION__, surface);
-    
+
+    D_DEBUG_AT (CairoDFB_Acquire,
+		"%s( surface=%p ).\n", __FUNCTION__, surface);
+
     buffer->Unlock (buffer);
-    
+
     cairo_surface_destroy (&image->base);
 }
 
 static cairo_status_t
 _cairo_directfb_surface_acquire_dest_image (void                     *abstract_surface,
                                             cairo_rectangle_int_t    *interest_rect,
                                             cairo_image_surface_t   **image_out,
                                             cairo_rectangle_int_t    *image_rect_out,
                                             void                    **image_extra)
 {
     cairo_directfb_surface_t *surface = abstract_surface;
-    
-    D_DEBUG_AT (CairoDFB_Acquire, 
-                "%s( surface=%p (%dx%d), interest_rect={ %u %u %u %u } ).\n", 
-                __FUNCTION__, surface, surface->width, surface->height,
-                interest_rect ? interest_rect->x : 0,
-                interest_rect ? interest_rect->y : 0,
-                interest_rect ? interest_rect->width  : (unsigned) surface->width,
-                interest_rect ? interest_rect->height : (unsigned) surface->height);
-    
-    return _directfb_acquire_surface (surface, interest_rect, image_out, 
-                                      image_rect_out, image_extra, DSLF_READ | DSLF_WRITE);
+
+    D_DEBUG_AT (CairoDFB_Acquire,
+		"%s( surface=%p (%dx%d), interest_rect={ %u %u %u %u } ).\n",
+		__FUNCTION__, surface, surface->width, surface->height,
+		interest_rect ? interest_rect->x : 0,
+		interest_rect ? interest_rect->y : 0,
+		interest_rect ? interest_rect->width  : (unsigned) surface->width,
+		interest_rect ? interest_rect->height : (unsigned) surface->height);
+
+    return _directfb_acquire_surface (surface, interest_rect, image_out,
+				      image_rect_out, image_extra,
+				      DSLF_READ | DSLF_WRITE);
 }
 
 static void
 _cairo_directfb_surface_release_dest_image (void                  *abstract_surface,
                                             cairo_rectangle_int_t *interest_rect,
                                             cairo_image_surface_t *image,
                                             cairo_rectangle_int_t *image_rect,
                                             void                  *image_extra)
 {
     cairo_directfb_surface_t *surface = abstract_surface;
-    IDirectFBSurface *buffer = image_extra; 
-    
-    D_DEBUG_AT (CairoDFB_Acquire, 
-                "%s( surface=%p ).\n", __FUNCTION__, surface);
-    
+    IDirectFBSurface *buffer = image_extra;
+
+    D_DEBUG_AT (CairoDFB_Acquire,
+		"%s( surface=%p ).\n", __FUNCTION__, surface);
+
     buffer->Unlock (buffer);
 
     if (surface->dfbsurface != buffer) {
-        DFBRegion region = { .x1 = interest_rect->x, .y1 = interest_rect->y,
-                             .x2 = interest_rect->x+interest_rect->width-1,
-                             .y2 = interest_rect->y+interest_rect->height-1 };
-        surface->dfbsurface->SetClip (surface->dfbsurface, &region);
-        surface->dfbsurface->SetBlittingFlags (surface->dfbsurface, DSBLIT_NOFX);
-        surface->dfbsurface->Blit (surface->dfbsurface, buffer,
-                                   NULL, image_rect->x, image_rect->y);
+	DFBRegion region = {
+	    .x1 = interest_rect->x,
+	    .y1 = interest_rect->y,
+	    .x2 = interest_rect->x + interest_rect->width - 1,
+	    .y2 = interest_rect->y + interest_rect->height - 1
+	};
+	surface->dfbsurface->SetBlittingFlags (surface->dfbsurface, DSBLIT_NOFX);
+	RUN_CLIPPED (surface, &region,
+		     surface->dfbsurface->Blit (surface->dfbsurface,
+						buffer, NULL,
+						image_rect->x, image_rect->y));
     }
-    
+
     cairo_surface_destroy (&image->base);
 }
 
 static cairo_status_t
 _cairo_directfb_surface_clone_similar (void             *abstract_surface,
                                        cairo_surface_t  *src,
                                        int               src_x,
                                        int               src_y,
                                        int               width,
                                        int               height,
+                                       int              *clone_offset_x,
+                                       int              *clone_offset_y,
                                        cairo_surface_t **clone_out)
 {
     cairo_directfb_surface_t *surface = abstract_surface;
     cairo_directfb_surface_t *clone;
-    
-    D_DEBUG_AT (CairoDFB_Surface, 
-                "%s( surface=%p, src=%p ).\n", __FUNCTION__, surface, src);
+
+    D_DEBUG_AT (CairoDFB_Surface,
+		"%s( surface=%p, src=%p ).\n", __FUNCTION__, surface, src);
 
     if (src->backend == surface->base.backend) {
-        cairo_surface_reference (src);
-        *clone_out = src;
-         
-        return CAIRO_STATUS_SUCCESS;
-    }
-    else if (_cairo_surface_is_image (src)) {
-        cairo_image_surface_t *image_src = (cairo_image_surface_t *) src;
-        unsigned char         *dst, *src = image_src->data;
-        int                    pitch;
-        int                    i, j;
-        DFBResult              ret;
-        
-        clone = (cairo_directfb_surface_t *)
-                _cairo_directfb_surface_create_similar (surface, 
-                            _cairo_content_from_format (image_src->format),
-                            image_src->width, image_src->height);
-        if (!clone)
-            return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-            
-        ret = clone->dfbsurface->Lock (clone->dfbsurface, 
-                                   DSLF_WRITE, (void *)&dst, &pitch);
-        if (ret) {
-            DirectFBError ("IDirectFBSurface::Lock()", ret);
-            cairo_surface_destroy ((cairo_surface_t *)clone);
-            return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        }
+	*clone_offset_x = 0;
+	*clone_offset_y = 0;
+	*clone_out = cairo_surface_reference (src);
+
+	return CAIRO_STATUS_SUCCESS;
+    } else if (_cairo_surface_is_image (src)) {
+	cairo_image_surface_t *image_src = (cairo_image_surface_t *) src;
+	unsigned char         *dst, *src = image_src->data;
+	int                    pitch;
+	int                    i, j;
+	DFBResult              ret;
+
+	clone = (cairo_directfb_surface_t *)
+	    _cairo_directfb_surface_create_similar (surface,
+						    _cairo_content_from_format (image_src->format),
+						    width, height);
+	if (clone == NULL)
+	    return CAIRO_INT_STATUS_UNSUPPORTED;
+	if (clone->base.status)
+	    return clone->base.status;
+
+	ret = clone->dfbsurface->Lock (clone->dfbsurface,
+				       DSLF_WRITE, (void *)&dst, &pitch);
+	if (ret) {
+	    DirectFBError ("IDirectFBSurface::Lock()", ret);
+	    cairo_surface_destroy (&clone->base);
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	}
 
-        dst += pitch * src_y;
-        src += image_src->stride * src_y;
-        
-        if (image_src->format == CAIRO_FORMAT_A1) {
-            /* A1 -> A8 */
-            for (i = 0; i < height; i++) {
-                for (j = src_x; j < src_x + width; j++)
-                    dst[j] = (src[j>>3] & (1 << (j&7))) ? 0xff : 0x00;
-                dst += pitch;
-                src += image_src->stride;
-            }
-        }
-        else {
-            int len;
-            
-            if (image_src->format == CAIRO_FORMAT_A8) {
-                dst += src_x;
-                src += src_x;
-                len  = width;
-            } else {
-                dst += src_x * 4;
-                src += src_x * 4;
-                len  = width * 4;
-            }
-            
-            for (i = 0; i < height; i++) {
-                direct_memcpy (dst, src, len);
-                dst += pitch;
-                src += image_src->stride;
-            }
-        }
-        
-        clone->dfbsurface->Unlock (clone->dfbsurface);
-        
-        *clone_out = &clone->base;
-                
-        return CAIRO_STATUS_SUCCESS;
+	src += image_src->stride * src_y;
+	if (image_src->format == CAIRO_FORMAT_A1) {
+	    /* A1 -> A8 */
+	    dst -= src_x;
+	    for (i = 0; i < height; i++) {
+		for (j = src_x; j < src_x + width; j++)
+		    dst[j] = (src[j>>3] & (1 << (j&7))) ? 0xff : 0x00;
+		dst += pitch;
+		src += image_src->stride;
+	    }
+	} else {
+	    int len;
+
+	    if (image_src->format == CAIRO_FORMAT_A8) {
+		src += src_x;
+		len  = width;
+	    } else {
+		src += src_x * 4;
+		len  = width * 4;
+	    }
+
+	    for (i = 0; i < height; i++) {
+		direct_memcpy (dst, src, len);
+		dst += pitch;
+		src += image_src->stride;
+	    }
+	}
+
+	clone->dfbsurface->Unlock (clone->dfbsurface);
+
+	*clone_offset_x = src_x;
+	*clone_offset_y = src_y;
+	*clone_out = &clone->base;
+	return CAIRO_STATUS_SUCCESS;
     }
-    
+
     return CAIRO_INT_STATUS_UNSUPPORTED;
 }
 
 #if DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS
 static cairo_int_status_t
 _directfb_prepare_composite (cairo_directfb_surface_t    *dst,
                              cairo_pattern_t             *src_pattern,
                              cairo_pattern_t             *mask_pattern,
                              cairo_operator_t             op,
                              int *src_x,             int *src_y,
                              int *mask_x,            int *mask_y,
                              unsigned int                 width,
-                             unsigned int                 height,                        
+                             unsigned int                 height,
                              cairo_directfb_surface_t   **ret_src,
                              cairo_surface_attributes_t  *ret_src_attr)
 {
     cairo_directfb_surface_t   *src;
     cairo_surface_attributes_t  src_attr;
-    cairo_status_t              ret;
+    cairo_status_t              status;
     DFBSurfaceBlittingFlags     flags;
     DFBSurfaceBlendFunction     sblend;
     DFBSurfaceBlendFunction     dblend;
-    DFBColor                    color;
-    
-    if (_directfb_get_operator (op, &sblend, &dblend))
+    const cairo_color_t        *color;
+
+    /* XXX Unbounded operators are not handled correctly */
+    if (! _cairo_operator_bounded_by_source (op))
         return CAIRO_INT_STATUS_UNSUPPORTED;
-     
+
+    if (! _directfb_get_operator (op, &sblend, &dblend))
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
     if (mask_pattern) {
-        cairo_solid_pattern_t *pattern;
-        
-        if (mask_pattern->type != CAIRO_PATTERN_TYPE_SOLID) {
-            cairo_pattern_t *tmp;
-            int              tmp_x, tmp_y;
-            
-            if (src_pattern->type != CAIRO_PATTERN_TYPE_SOLID ||
-                sblend == DSBF_INVDESTALPHA) /* Doesn't work correctly */
-                return CAIRO_INT_STATUS_UNSUPPORTED;
-                
-            D_DEBUG_AT (CairoDFB_Render, "Replacing src pattern by mask pattern.\n");
-                
-            tmp = src_pattern;
-            tmp_x = *src_x; tmp_y = *src_y;
-            
-            src_pattern = mask_pattern;
-            *src_x = *mask_x; *src_y = *mask_y;
-            
-            mask_pattern = tmp;
-            *mask_x = tmp_x; *mask_y = tmp_y;
-            
-            if (sblend == DSBF_ONE) {                  
-                sblend = DSBF_SRCALPHA;
-                /*dblend = DSBF_INVSRCALPHA;*/
-            }
-        }
-            
-        pattern = (cairo_solid_pattern_t *)mask_pattern;
-        color.a = pattern->color.alpha_short >> 8;
-        color.r = pattern->color.red_short   >> 8;
-        color.g = pattern->color.green_short >> 8;
-        color.b = pattern->color.blue_short  >> 8;
-    } 
-    else {
-        color.a = color.r = color.g = color.b = 0xff;
-    }
-        
-    if (src_pattern->type == CAIRO_PATTERN_TYPE_SOLID) {
-        cairo_solid_pattern_t *pattern = (cairo_solid_pattern_t *)src_pattern;
-         
-        if (!dst->color) {
-            dst->color = _cairo_directfb_surface_create_similar (dst,
-                                                CAIRO_CONTENT_COLOR_ALPHA, 1, 1);
-            if (!dst->color)
-                return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        }
-        
-        src = (cairo_directfb_surface_t *)dst->color;
-        src->dfbsurface->Clear (src->dfbsurface,
-                                pattern->color.red_short   >> 8,
-                                pattern->color.green_short >> 8,
-                                pattern->color.blue_short  >> 8,
-                                pattern->color.alpha_short >> 8);
-                                  
-        src_attr.matrix   = src_pattern->matrix;
-        src_attr.extend   = CAIRO_EXTEND_NONE;
-        src_attr.filter   = CAIRO_FILTER_NEAREST;
-        src_attr.x_offset =
-        src_attr.y_offset = 0;
-    }
-    else {
-        ret = _cairo_pattern_acquire_surface (src_pattern, &dst->base,
-                                              *src_x, *src_y, width, height,
-                                              (cairo_surface_t **)&src, &src_attr);
-        if (ret)
-            return ret;
-    }
-    
-    if (src->content == CAIRO_CONTENT_COLOR) {
-        if (sblend == DSBF_SRCALPHA)
-            sblend = DSBF_ONE;
-        else if (sblend == DSBF_INVSRCALPHA)
-            sblend = DSBF_ZERO;
-            
-        if (dblend == DSBF_SRCALPHA)
-            dblend = DSBF_ONE;
-        else if (dblend == DSBF_INVSRCALPHA)
-            dblend = DSBF_ZERO;
-    }
-    if (dst->content == CAIRO_CONTENT_COLOR) {
-        if (sblend == DSBF_DESTALPHA)
-            sblend = DSBF_ONE;
-        else if (sblend == DSBF_INVDESTALPHA)
-            sblend = DSBF_ZERO;
-         
-        if (dblend == DSBF_DESTALPHA)
-            dblend = DSBF_ONE;
-        else if (dblend == DSBF_INVDESTALPHA)
-            dblend = DSBF_ZERO;   
+	cairo_solid_pattern_t *pattern;
+
+		return CAIRO_INT_STATUS_UNSUPPORTED;
+	if (mask_pattern->type != CAIRO_PATTERN_TYPE_SOLID) {
+	    cairo_pattern_t *tmp;
+	    int              tmp_x, tmp_y;
+
+	    if (src_pattern->type != CAIRO_PATTERN_TYPE_SOLID ||
+		sblend == DSBF_INVDESTALPHA) /* Doesn't work correctly */
+		return CAIRO_INT_STATUS_UNSUPPORTED;
+
+	    D_DEBUG_AT (CairoDFB_Render, "Replacing src pattern by mask pattern.\n");
+
+	    tmp = src_pattern;
+	    tmp_x = *src_x; tmp_y = *src_y;
+
+	    src_pattern = mask_pattern;
+	    *src_x = *mask_x; *src_y = *mask_y;
+
+	    mask_pattern = tmp;
+	    *mask_x = tmp_x; *mask_y = tmp_y;
+
+	    if (sblend == DSBF_ONE) {
+		sblend = DSBF_SRCALPHA;
+		/*dblend = DSBF_INVSRCALPHA;*/
+	    }
+	}
+
+	color = &((cairo_solid_pattern_t *) mask_pattern)->color;
+    } else {
+	color = _cairo_stock_color (CAIRO_STOCK_WHITE);
     }
 
-    flags = (sblend == DSBF_ONE && dblend == DSBF_ZERO) 
-            ? DSBLIT_NOFX : DSBLIT_BLEND_ALPHACHANNEL; 
-    if (color.a != 0xff)
-        flags |= DSBLIT_BLEND_COLORALPHA;
-    if (color.r != 0xff || color.g != 0xff || color.b != 0xff)
-        flags |= DSBLIT_COLORIZE;
-            
+    /* XXX DirectFB currently does not support filtering, so force NEAREST
+     * in order to hit optimisations inside core.
+    */
+    src_pattern->filter = CAIRO_FILTER_NEAREST;
+
+    status = _cairo_pattern_acquire_surface (src_pattern, &dst->base,
+					     *src_x, *src_y, width, height,
+					     (cairo_surface_t **) &src,
+					     &src_attr);
+    if (status)
+	return status;
+
+    if (src->base.backend != &_cairo_directfb_surface_backend ||
+	src->dfb != dst->dfb)
+    {
+	_cairo_pattern_release_surface (src_pattern, &src->base, &src_attr);
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+    }
+
+    if (src->content == CAIRO_CONTENT_COLOR) {
+	if (sblend == DSBF_SRCALPHA)
+	    sblend = DSBF_ONE;
+	else if (sblend == DSBF_INVSRCALPHA)
+	    sblend = DSBF_ZERO;
+
+	if (dblend == DSBF_SRCALPHA)
+	    dblend = DSBF_ONE;
+	else if (dblend == DSBF_INVSRCALPHA)
+	    dblend = DSBF_ZERO;
+    }
+
+    if (dst->content == CAIRO_CONTENT_COLOR) {
+	if (sblend == DSBF_DESTALPHA)
+	    sblend = DSBF_ONE;
+	else if (sblend == DSBF_INVDESTALPHA)
+	    sblend = DSBF_ZERO;
+
+	if (dblend == DSBF_DESTALPHA)
+	    dblend = DSBF_ONE;
+	else if (dblend == DSBF_INVDESTALPHA)
+	    dblend = DSBF_ZERO;
+    }
+
+    flags = (sblend == DSBF_ONE && dblend == DSBF_ZERO)
+	? DSBLIT_NOFX : DSBLIT_BLEND_ALPHACHANNEL;
+    if (! CAIRO_COLOR_IS_OPAQUE (color))
+	flags |= DSBLIT_BLEND_COLORALPHA;
+    if (! _cairo_color_equal (color, _cairo_stock_color (CAIRO_STOCK_WHITE)))
+	flags |= DSBLIT_COLORIZE;
+
     dst->dfbsurface->SetBlittingFlags (dst->dfbsurface, flags);
-    
+
     if (flags & (DSBLIT_BLEND_ALPHACHANNEL | DSBLIT_BLEND_COLORALPHA)) {
-        dst->dfbsurface->SetSrcBlendFunction (dst->dfbsurface, sblend);
-        dst->dfbsurface->SetDstBlendFunction (dst->dfbsurface, dblend);
+	dst->dfbsurface->SetSrcBlendFunction (dst->dfbsurface, sblend);
+	dst->dfbsurface->SetDstBlendFunction (dst->dfbsurface, dblend);
     }
-    
-    if (flags & (DSBLIT_BLEND_COLORALPHA | DSBLIT_COLORIZE))    
-        dst->dfbsurface->SetColor (dst->dfbsurface, color.r, color.g, color.b, color.a); 
-        
+
+    if (flags & (DSBLIT_BLEND_COLORALPHA | DSBLIT_COLORIZE)) {
+	if (dst->blit_premultiplied) {
+	    dst->dfbsurface->SetColor (dst->dfbsurface,
+				       color->red_short >> 8,
+				       color->green_short >> 8,
+				       color->blue_short >> 8,
+				       color->alpha_short >> 8);
+	} else {
+	    dst->dfbsurface->SetColor (dst->dfbsurface,
+				       color->red * 0xff,
+				       color->green * 0xff,
+				       color->blue * 0xff,
+				       color->alpha * 0xff);
+	}
+    }
+
     *ret_src = src;
     *ret_src_attr = src_attr;
-    
+
     return CAIRO_STATUS_SUCCESS;
 }
 
 static void
 _directfb_finish_composite (cairo_directfb_surface_t   *dst,
                             cairo_pattern_t            *src_pattern,
                             cairo_surface_t            *src,
                             cairo_surface_attributes_t *src_attr)
 {
-    if (src != dst->color)
-         _cairo_pattern_release_surface (src_pattern, src, src_attr);
+    _cairo_pattern_release_surface (src_pattern, src, src_attr);
 }
-#endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */        
+#endif /* DFB_COMPOSITE || DFB_COMPOSITE_TRAPEZOIDS */
 
 #if DFB_COMPOSITE
 static DFBAccelerationMask
 _directfb_categorize_operation (cairo_surface_attributes_t *src_attr)
 {
     cairo_matrix_t *m = &src_attr->matrix;
-    
+
     if (m->xy != 0 || m->yx != 0 || m->xx < 0 || m->yy < 0) {
-        if (src_attr->extend != CAIRO_EXTEND_NONE)
-            return DFXL_NONE;
-        return DFXL_TEXTRIANGLES;
+	if (src_attr->extend != CAIRO_EXTEND_NONE)
+	    return DFXL_NONE;
+
+	return DFXL_TEXTRIANGLES;
     }
-        
+
     if (m->xx != 1 || m->yy != 1) {
-        if (src_attr->extend != CAIRO_EXTEND_NONE)
-            return DFXL_NONE;
-        return DFXL_STRETCHBLIT;
+	if (src_attr->extend != CAIRO_EXTEND_NONE)
+	    return DFXL_NONE;
+
+	return DFXL_STRETCHBLIT;
     }
-     
-    if (src_attr->extend != CAIRO_EXTEND_NONE &&
-        src_attr->extend != CAIRO_EXTEND_REPEAT)
-        return DFXL_NONE;
-           
-    return DFXL_BLIT;
+
+    switch (src_attr->extend) {
+    case CAIRO_EXTEND_NONE:
+    case CAIRO_EXTEND_REPEAT:
+	if (_cairo_matrix_is_integer_translation (&src_attr->matrix,
+						  NULL, NULL))
+	{
+	    return DFXL_BLIT;
+	}
+	else
+	{
+	    return DFXL_STRETCHBLIT;
+	}
+
+    default:
+    case CAIRO_EXTEND_REFLECT:
+    case CAIRO_EXTEND_PAD:
+	return DFXL_NONE;
+    }
 }
 
 static cairo_int_status_t
 _cairo_directfb_surface_composite (cairo_operator_t  op,
                                    cairo_pattern_t  *src_pattern,
                                    cairo_pattern_t  *mask_pattern,
                                    void             *abstract_dst,
                                    int  src_x,  int  src_y,
                                    int  mask_x, int  mask_y,
                                    int  dst_x,  int  dst_y,
                                    unsigned int      width,
                                    unsigned int      height)
 {
     cairo_directfb_surface_t   *dst = abstract_dst;
     cairo_directfb_surface_t   *src;
     cairo_surface_attributes_t  src_attr;
+    cairo_bool_t                is_integer_translation;
     DFBAccelerationMask         accel, mask;
-    cairo_int_status_t          ret;
-    
+    cairo_int_status_t          status;
+    int                         tx, ty;
+
     D_DEBUG_AT (CairoDFB_Render,
-                "%s( op=%d, src_pattern=%p, mask_pattern=%p, dst=%p,"
-                   " src_x=%d, src_y=%d, mask_x=%d, mask_y=%d, dst_x=%d,"
-                   " dst_y=%d, width=%u, height=%u ).\n",
-                __FUNCTION__, op, src_pattern, mask_pattern, dst, 
-                src_x, src_y, mask_x, mask_y, dst_x, dst_y, width, height);
-    
-    ret = _directfb_prepare_composite (dst, src_pattern, mask_pattern, op,
-                                       &src_x, &src_y, &mask_x, &mask_y, 
-                                       width, height, &src, &src_attr);
-    if (ret)
-        return ret;
-        
+		"%s( op=%d, src_pattern=%p, mask_pattern=%p, dst=%p,"
+		" src_x=%d, src_y=%d, mask_x=%d, mask_y=%d, dst_x=%d,"
+		" dst_y=%d, width=%u, height=%u ).\n",
+		__FUNCTION__, op, src_pattern, mask_pattern, dst,
+		src_x, src_y, mask_x, mask_y, dst_x, dst_y, width, height);
+
+    status = _directfb_prepare_composite (dst, src_pattern, mask_pattern, op,
+					  &src_x, &src_y, &mask_x, &mask_y,
+					  width, height, &src, &src_attr);
+    if (status)
+	return status;
+
     accel = _directfb_categorize_operation (&src_attr);
-    
-    dst->dfbsurface->GetAccelerationMask (dst->dfbsurface, src->dfbsurface, &mask);
-    if (!(mask & accel)) {
-        D_DEBUG_AT (CairoDFB_Render, "No acceleration (%08x)!\n", accel);
-        if (accel != DFXL_BLIT) {
-            _directfb_finish_composite (dst, src_pattern, &src->base, &src_attr);
-            return CAIRO_INT_STATUS_UNSUPPORTED;
-        }
+    if (accel == DFXL_NONE) {
+	_directfb_finish_composite (dst, src_pattern, &src->base, &src_attr);
+	return CAIRO_INT_STATUS_UNSUPPORTED;
     }
-    
+
+    dst->dfbsurface->GetAccelerationMask (dst->dfbsurface,
+					  src->dfbsurface,
+					  &mask);
+    if ((mask & accel) == 0) {
+	D_DEBUG_AT (CairoDFB_Render, "No acceleration (%08x)!\n", accel);
+	if (accel != DFXL_BLIT) {
+	    _directfb_finish_composite (dst, src_pattern, &src->base, &src_attr);
+	    return CAIRO_INT_STATUS_UNSUPPORTED;
+	}
+    }
+
     src_x += src_attr.x_offset;
     src_y += src_attr.y_offset;
-    
+
     switch (accel) {
-        case DFXL_BLIT: {
-            DFBRectangle sr;
-        
-            sr.x = src_x + _cairo_lround (src_attr.matrix.x0);
-            sr.y = src_y + _cairo_lround (src_attr.matrix.y0);
-            sr.w = width;
-            sr.h = height;
-        
-            if (src_attr.extend == CAIRO_EXTEND_NONE) {
-                D_DEBUG_AT (CairoDFB_Render, "Running Blit().\n");
-        
-                RUN_CLIPPED( dst, NULL,
-                             dst->dfbsurface->Blit (dst->dfbsurface,
-                                            src->dfbsurface, &sr, dst_x, dst_y));
-            }
-            else if (src_attr.extend == CAIRO_EXTEND_REPEAT) {
-                DFBRegion clip;
-            
-                clip.x1 = dst_x;
-                clip.y1 = dst_y;
-                clip.x2 = dst_x + width  - 1;
-                clip.y2 = dst_y + height - 1;
-            
-                D_DEBUG_AT (CairoDFB_Render, "Running TileBlit().\n");
-            
-                RUN_CLIPPED( dst, &clip,
-                             dst->dfbsurface->TileBlit (dst->dfbsurface, 
-                                            src->dfbsurface, &sr, dst_x, dst_y));
-            }
-        }   break;
-        
-        case DFXL_STRETCHBLIT: {
-            DFBRectangle sr, dr;
-            double       x1, y1, x2, y2;
-            
-            TRANSFORM_POINT2X (src_attr.matrix, 
-                               src_x, src_y, x1, y1);
-            TRANSFORM_POINT2X (src_attr.matrix, 
-                               src_x+width, src_y+height, x2, y2);
-                               
-            sr.x = _cairo_lround (x1);
-            sr.y = _cairo_lround (y1);
-            sr.w = _cairo_lround (x2-x1);
-            sr.h = _cairo_lround (y2-y1);
-            
-            dr.x = dst_x;
-            dr.y = dst_y;
-            dr.w = width;
-            dr.h = height;
-            
-            D_DEBUG_AT (CairoDFB_Render, "Running StretchBlit().\n");
+    case DFXL_BLIT:
+	{
+	    DFBRectangle sr;
+
+	    is_integer_translation =
+		_cairo_matrix_is_integer_translation (&src_attr.matrix,
+						      &tx, &ty);
+	    assert (is_integer_translation);
+
+	    sr.x = src_x + tx;
+	    sr.y = src_y + ty;
+	    sr.w = width;
+	    sr.h = height;
+
+	    if (src_attr.extend == CAIRO_EXTEND_NONE) {
+		D_DEBUG_AT (CairoDFB_Render, "Running Blit().\n");
+
+		RUN_CLIPPED (dst, NULL,
+			     dst->dfbsurface->Blit (dst->dfbsurface,
+						    src->dfbsurface,
+						    &sr,
+						    dst_x, dst_y));
+	    } else if (src_attr.extend == CAIRO_EXTEND_REPEAT) {
+		DFBRegion clip;
+
+		clip.x1 = dst_x;
+		clip.y1 = dst_y;
+		clip.x2 = dst_x + width  - 1;
+		clip.y2 = dst_y + height - 1;
+
+		D_DEBUG_AT (CairoDFB_Render, "Running TileBlit().\n");
+
+		RUN_CLIPPED (dst, &clip,
+			     dst->dfbsurface->TileBlit (dst->dfbsurface,
+							src->dfbsurface,
+							&sr,
+							dst_x, dst_y));
+	    }
+	    break;
+	}
+
+    case DFXL_STRETCHBLIT:
+	{
+	    DFBRectangle sr, dr;
+	    double       x1, y1, x2, y2;
+
+	    TRANSFORM_POINT2X (src_attr.matrix,
+			       src_x, src_y, x1, y1);
+	    TRANSFORM_POINT2X (src_attr.matrix,
+			       src_x+width, src_y+height, x2, y2);
+
+	    sr.x = floor (x1);
+	    sr.y = floor (y1);
+	    sr.w = ceil (x2) - sr.x;
+	    sr.h = ceil (y2) - sr.y;
+
+	    dr.x = dst_x;
+	    dr.y = dst_y;
+	    dr.w = width;
+	    dr.h = height;
+
+	    D_DEBUG_AT (CairoDFB_Render, "Running StretchBlit().\n");
 
-            RUN_CLIPPED (dst, NULL,
-                         dst->dfbsurface->StretchBlit (dst->dfbsurface, 
-                                                       src->dfbsurface, &sr, &dr));
-        }   break;
-        
-        case DFXL_TEXTRIANGLES: {
-            DFBRegion clip;
-            DFBVertex v[4];
-            float     x1, y1, x2, y2;
-            int       w, h;
-            
-            if (cairo_matrix_invert (&src_attr.matrix) != CAIRO_STATUS_SUCCESS) {
-                ret = CAIRO_INT_STATUS_UNSUPPORTED;
-                break;
-            }
-            
-            x1 = src_attr.x_offset;
-            y1 = src_attr.y_offset;
-            x2 = src->width  - x1;
-            y2 = src->height - y1;
-            
-            src->dfbsurface->GetSize (src->dfbsurface, &w, &h);
-            
-            TRANSFORM_POINT3X (src_attr.matrix, 
-                               x1, y1, v[0].x, v[0].y);
-            v[0].z = 0;
-            v[0].w = 1;
-            v[0].s = x1 / w;
-            v[0].t = y1 / h;
-        
-            TRANSFORM_POINT3X (src_attr.matrix, 
-                               x2, y1, v[1].x, v[1].y);
-            v[1].z = 0;
-            v[1].w = 1;
-            v[1].s = x2 / w;
-            v[1].t = y1 / h;
-        
-            TRANSFORM_POINT3X (src_attr.matrix,
-                               x2, y2, v[2].x, v[2].y);
-            v[2].z = 0;
-            v[2].w = 1;
-            v[2].s = x2 / w;
-            v[2].t = y2 / h;
-        
-            TRANSFORM_POINT3X (src_attr.matrix, 
-                               x1, y2, v[3].x, v[3].y);
-            v[3].z = 0;
-            v[3].w = 1;
-            v[3].s = x1 / w;
-            v[3].t = y2 / h;
-            
-            clip.x1 = dst_x;
-            clip.y1 = dst_y;
-            clip.x2 = dst_x + width  - 1;
-            clip.y2 = dst_y + height - 1;
-        
-            D_DEBUG_AT (CairoDFB_Render, "Running TextureTriangles().\n");
-            
-            RUN_CLIPPED (dst, &clip,
-                         dst->dfbsurface->TextureTriangles (dst->dfbsurface, 
-                                            src->dfbsurface, v, NULL, 4, DTTF_FAN));
-        }   break;
-        
-        default:
-            D_BUG ("Unexpected operation");
-            break;
+	    RUN_CLIPPED (dst, NULL,
+			 dst->dfbsurface->StretchBlit (dst->dfbsurface,
+						       src->dfbsurface, &sr, &dr));
+	    break;
+	}
+
+    case DFXL_TEXTRIANGLES:
+	{
+	    DFBRegion clip;
+	    DFBVertex v[4];
+	    float     x1, y1, x2, y2;
+	    int       w, h;
+
+	    status = cairo_matrix_invert (&src_attr.matrix);
+	    /* guaranteed by cairo_pattern_set_matrix (); */
+	    assert (status == CAIRO_STATUS_SUCCESS);
+
+	    x1 = src_x;
+	    y1 = src_y;
+	    x2 = width  + x1;
+	    y2 = height + y1;
+
+	    src->dfbsurface->GetSize (src->dfbsurface, &w, &h);
+
+	    TRANSFORM_POINT3X (src_attr.matrix,
+			       x1, y1, v[0].x, v[0].y);
+	    v[0].z = 0;
+	    v[0].w = 1;
+	    v[0].s = x1 / w;
+	    v[0].t = y1 / h;
+
+	    TRANSFORM_POINT3X (src_attr.matrix,
+			       x2, y1, v[1].x, v[1].y);
+	    v[1].z = 0;
+	    v[1].w = 1;
+	    v[1].s = x2 / w;
+	    v[1].t = y1 / h;
+
+	    TRANSFORM_POINT3X (src_attr.matrix,
+			       x2, y2, v[2].x, v[2].y);
+	    v[2].z = 0;
+	    v[2].w = 1;
+	    v[2].s = x2 / w;
+	    v[2].t = y2 / h;
+
+	    TRANSFORM_POINT3X (src_attr.matrix,
+			       x1, y2, v[3].x, v[3].y);
+	    v[3].z = 0;
+	    v[3].w = 1;
+	    v[3].s = x1 / w;
+	    v[3].t = y2 / h;
+
+	    clip.x1 = dst_x;
+	    clip.y1 = dst_y;
+	    clip.x2 = dst_x + width  - 1;
+	    clip.y2 = dst_y + height - 1;
+
+	    D_DEBUG_AT (CairoDFB_Render, "Running TextureTriangles().\n");
+
+	    RUN_CLIPPED (dst, &clip,
+			 dst->dfbsurface->TextureTriangles (dst->dfbsurface,
+							    src->dfbsurface, v, NULL, 4, DTTF_FAN));
+	    break;
+	}
+
+    default:
+	D_BUG ("Unexpected operation");
+	break;
     }
 
     _directfb_finish_composite (dst, src_pattern, &src->base, &src_attr);
-    
-    return ret;
+
+    return status;
 }
 #endif /* DFB_COMPOSITE */
 
 #if DFB_RECTANGLES
 static cairo_int_status_t
 _cairo_directfb_surface_fill_rectangles (void                  *abstract_surface,
                                          cairo_operator_t       op,
                                          const cairo_color_t   *color,
@@ -1049,316 +1091,320 @@ static cairo_int_status_t
                                          int                    n_rects)
 {
     cairo_directfb_surface_t *dst   = abstract_surface;
     DFBSurfaceDrawingFlags    flags;
     DFBSurfaceBlendFunction   sblend;
     DFBSurfaceBlendFunction   dblend;
     DFBRectangle              r[n_rects];
     int                       i;
-    
-    D_DEBUG_AT (CairoDFB_Render, 
-                "%s( dst=%p, op=%d, color=%p, rects=%p, n_rects=%d ).\n",
-                __FUNCTION__, dst, op, color, rects, n_rects);
 
-    if (_directfb_get_operator (op, &sblend, &dblend))
+    D_DEBUG_AT (CairoDFB_Render,
+		"%s( dst=%p, op=%d, color=%p, rects=%p, n_rects=%d ).\n",
+		__FUNCTION__, dst, op, color, rects, n_rects);
+
+    if (! _cairo_operator_bounded_by_source (op))
         return CAIRO_INT_STATUS_UNSUPPORTED;
-        
-    if (color->alpha_short >= 0xff00) {
-        if (sblend == DSBF_SRCALPHA)
-            sblend = DSBF_ONE;
-        else if (sblend == DSBF_INVSRCALPHA)
-            sblend = DSBF_ZERO;
-            
-        if (dblend == DSBF_SRCALPHA)
-            dblend = DSBF_ONE;
-        else if (dblend == DSBF_INVSRCALPHA)
-            dblend = DSBF_ZERO;
+
+    if (! _directfb_get_operator (op, &sblend, &dblend))
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    if (CAIRO_COLOR_IS_OPAQUE (color)) {
+	if (sblend == DSBF_SRCALPHA)
+	    sblend = DSBF_ONE;
+	else if (sblend == DSBF_INVSRCALPHA)
+	    sblend = DSBF_ZERO;
+
+	if (dblend == DSBF_SRCALPHA)
+	    dblend = DSBF_ONE;
+	else if (dblend == DSBF_INVSRCALPHA)
+	    dblend = DSBF_ZERO;
     }
     if (dst->content == CAIRO_CONTENT_COLOR) {
-        if (sblend == DSBF_DESTALPHA)
-            sblend = DSBF_ONE;
-        else if (sblend == DSBF_INVDESTALPHA)
-            sblend = DSBF_ZERO;
-         
-        if (dblend == DSBF_DESTALPHA)
-            dblend = DSBF_ONE;
-        else if (dblend == DSBF_INVDESTALPHA)
-            dblend = DSBF_ZERO;   
+	if (sblend == DSBF_DESTALPHA)
+	    sblend = DSBF_ONE;
+	else if (sblend == DSBF_INVDESTALPHA)
+	    sblend = DSBF_ZERO;
+
+	if (dblend == DSBF_DESTALPHA)
+	    dblend = DSBF_ONE;
+	else if (dblend == DSBF_INVDESTALPHA)
+	    dblend = DSBF_ZERO;
     }
-    
+
     flags = (sblend == DSBF_ONE && dblend == DSBF_ZERO) ? DSDRAW_NOFX : DSDRAW_BLEND;
     dst->dfbsurface->SetDrawingFlags (dst->dfbsurface, flags);
     if (flags & DSDRAW_BLEND) {
-        dst->dfbsurface->SetSrcBlendFunction (dst->dfbsurface, sblend);
-        dst->dfbsurface->SetDstBlendFunction (dst->dfbsurface, dblend);
-    }    
-    
-    dst->dfbsurface->SetColor (dst->dfbsurface, 
-                               color->red_short   >> 8,
-                               color->green_short >> 8, 
-                               color->blue_short  >> 8, 
-                               color->alpha_short >> 8 );
-       
+	dst->dfbsurface->SetSrcBlendFunction (dst->dfbsurface, sblend);
+	dst->dfbsurface->SetDstBlendFunction (dst->dfbsurface, dblend);
+    }
+
+    dst->dfbsurface->SetColor (dst->dfbsurface,
+			       color->red_short >> 8,
+			       color->green_short >> 8,
+			       color->blue_short >> 8,
+			       color->alpha_short >> 8);
+
     for (i = 0; i < n_rects; i++) {
-        r[i].x = rects[i].x;
-        r[i].y = rects[i].y;
-        r[i].w = rects[i].width;
-        r[i].h = rects[i].height;
+	r[i].x = rects[i].x;
+	r[i].y = rects[i].y;
+	r[i].w = rects[i].width;
+	r[i].h = rects[i].height;
     }
-     
+
     RUN_CLIPPED (dst, NULL,
-                 dst->dfbsurface->FillRectangles (dst->dfbsurface, r, n_rects));
-    
+		 dst->dfbsurface->FillRectangles (dst->dfbsurface, r, n_rects));
+
     return CAIRO_STATUS_SUCCESS;
 }
 #endif
 
 #if DFB_COMPOSITE_TRAPEZOIDS
 static cairo_int_status_t
 _cairo_directfb_surface_composite_trapezoids (cairo_operator_t   op,
                                               cairo_pattern_t   *pattern,
                                               void              *abstract_dst,
                                               cairo_antialias_t  antialias,
                                               int  src_x,   int  src_y,
                                               int  dst_x,   int  dst_y,
                                               unsigned int       width,
                                               unsigned int       height,
                                               cairo_trapezoid_t *traps,
-                                              int                num_traps )
+                                              int                num_traps)
 {
     cairo_directfb_surface_t   *dst = abstract_dst;
     cairo_directfb_surface_t   *src;
     cairo_surface_attributes_t  src_attr;
-    cairo_status_t              ret;
+    cairo_status_t              status;
     DFBAccelerationMask         accel;
-    
+
     D_DEBUG_AT (CairoDFB_Render,
                 "%s( op=%d, pattern=%p, dst=%p, antialias=%d,"
                    " src_x=%d, src_y=%d, dst_x=%d, dst_y=%d,"
                    " width=%u, height=%u, traps=%p, num_traps=%d ).\n",
                 __FUNCTION__, op, pattern, dst, antialias,
                 src_x, src_y, dst_x, dst_y, width, height, traps, num_traps);
 
     if (antialias != CAIRO_ANTIALIAS_NONE)
         return CAIRO_INT_STATUS_UNSUPPORTED;
-        
+
     /* Textures are not supported yet. */
     if (pattern->type != CAIRO_PATTERN_TYPE_SOLID)
         return CAIRO_INT_STATUS_UNSUPPORTED;
-    
-    ret = _directfb_prepare_composite (dst, pattern, NULL, op,
-                                       &src_x, &src_y, NULL, NULL, 
-                                       width, height, &src, &src_attr);
-    if (ret)
-        return ret;
-   
-    dst->dfbsurface->GetAccelerationMask (dst->dfbsurface, src->dfbsurface, &accel);
-    
-    ret = CAIRO_INT_STATUS_UNSUPPORTED;
-    
+
+    status = _directfb_prepare_composite (dst, pattern, NULL, op,
+					  &src_x, &src_y, NULL, NULL,
+					  width, height, &src, &src_attr);
+    if (status)
+        return status;
+
+    dst->dfbsurface->GetAccelerationMask (dst->dfbsurface,
+					  src->dfbsurface,
+					  &accel);
+
+    status = CAIRO_INT_STATUS_UNSUPPORTED;
+
     if (accel & DFXL_TEXTRIANGLES) {
         DFBVertex  vertex[6*num_traps];
         DFBVertex *v = &vertex[0];
-        int        n;
-      
-#define ADD_TRI(id, x1, y1, s1, t1, x2, y2, s2, t2, x3, y3, s3, t3) {\
+        int        n = 0;
+
+#define ADD_TRI_V(V, X, Y) do { \
+    (V)->x = (X); (V)->y = (Y); (V)->w = 1; (V)->z = (V)->s = (V)->t = 0; \
+} while (0)
+#define ADD_TRI(id, x1, y1, x2, y2, x3, y3) do {\
     const int p = (id)*3;\
-    v[p+0].x=(x1); v[p+0].y=(y1); v[p+0].z=0; v[p+0].w=1; v[p+0].s=(s1); v[p+0].t=(t1);\
-    v[p+1].x=(x2); v[p+1].y=(y2); v[p+1].z=0; v[p+1].w=1; v[p+1].s=(s2); v[p+1].t=(t2);\
-    v[p+2].x=(x3); v[p+2].y=(y3); v[p+2].z=0; v[p+2].w=1; v[p+2].s=(s3); v[p+2].t=(t3);\
-}         
-       
-        for (n = 0; num_traps; num_traps--) {
-            float lx1, ly1, lx2, ly2;
-            float rx1, ry1, rx2, ry2;
-            
-            /* XXX: Do we need to validate the trapezoid? */
- 
-            lx1 = traps->left.p1.x/65536.0;
-            ly1 = traps->left.p1.y/65536.0;
-            lx2 = traps->left.p2.x/65536.0;
-            ly2 = traps->left.p2.y/65536.0;
-            rx1 = traps->right.p1.x/65536.0;
-            ry1 = traps->right.p1.y/65536.0;
-            rx2 = traps->right.p2.x/65536.0;
-            ry2 = traps->right.p2.y/65536.0;
-            
+    ADD_TRI_V (v+p+0, x1, y1); \
+    ADD_TRI_V (v+p+1, x2, y2); \
+    ADD_TRI_V (v+p+2, x3, y3); \
+} while (0)
+	while (num_traps--) {
+            double lx1, ly1, lx2, ly2;
+            double rx1, ry1, rx2, ry2;
+
+            lx1 = _cairo_fixed_to_double (traps->left.p1.x);
+            ly1 = _cairo_fixed_to_double (traps->left.p1.y);
+            lx2 = _cairo_fixed_to_double (traps->left.p2.x);
+            ly2 = _cairo_fixed_to_double (traps->left.p2.y);
+            rx1 = _cairo_fixed_to_double (traps->right.p1.x);
+            ry1 = _cairo_fixed_to_double (traps->right.p1.y);
+            rx2 = _cairo_fixed_to_double (traps->right.p2.x);
+            ry2 = _cairo_fixed_to_double (traps->right.p2.y);
+
             if (traps->left.p1.y < traps->top) {
-                float y = traps->top/65536.0;
+                double y = _cairo_fixed_to_double (traps->top);
                 if (lx2 != lx1)
                     lx1 = (y - ly1) * (lx2 - lx1) / (ly2 - ly1) + lx1;
                 ly1 = y;
-            } 
+            }
             if (traps->left.p2.y > traps->bottom) {
-                float y = traps->bottom/65536.0;
+                double y = _cairo_fixed_to_double (traps->bottom);
                 if (lx2 != lx1)
                     lx2 = (y - ly1) * (lx2 - lx1) / (ly2 - ly1) + lx1;
                 ly2 = y;
             }
-            
+
             if (traps->right.p1.y < traps->top) {
-                float y = traps->top/65536.0;
+                double y = _cairo_fixed_to_double (traps->top);
                 if (rx2 != rx1)
                     rx1 = (y - ry1) * (rx2 - rx1) / (ry2 - ry1) + rx1;
                 ry1 = y;
             }
             if (traps->right.p2.y > traps->bottom) {
-                float y = traps->bottom/65536.0;
+                double y = _cairo_fixed_to_double (traps->bottom);
                 if (rx2 != rx1)
                     rx2 = (y - ry1) * (rx2 - rx1) / (ry2 - ry1) + rx1;
                 ry2 = y;
             }
-             
+
             if (lx1 == rx1 && ly1 == ry1) {
-                ADD_TRI (0, lx2, ly2, 0, 0,
-                            lx1, ly1, 0, 0,
-                            rx2, ry2, 0, 0 );
+                ADD_TRI (0, lx2, ly2, lx1, ly1, rx2, ry2);
                 v += 3;
                 n += 3;
-            }
-            else if (lx2 == rx2 && ly2 == ry2) {
-                ADD_TRI (0, lx1, ly1, 0, 0,
-                            lx2, ly2, 0, 0,
-                            rx1, ry1, 0, 0 );
+            } else if (lx2 == rx2 && ly2 == ry2) {
+                ADD_TRI (0, lx1, ly1, lx2, ly2, rx1, ry1);
                 v += 3;
                 n += 3;
-            }
-            else {
-                ADD_TRI (0, lx1, ly1, 0, 0, 
-                            rx1, ry1, 0, 0,
-                            lx2, ly2, 0, 0);
-                ADD_TRI (1, lx2, ly2, 0, 0,
-                            rx1, ry1, 0, 0,
-                            rx2, ry2, 0, 0);            
+            } else {
+                ADD_TRI (0, lx1, ly1, rx1, ry1, lx2, ly2);
+                ADD_TRI (1, lx2, ly2, rx1, ry1, rx2, ry2);
                 v += 6;
                 n += 6;
             }
-            
+
             traps++;
         }
-        
 #undef ADD_TRI
-              
+#undef ADD_TRI_V
+
         D_DEBUG_AT (CairoDFB_Render, "Running TextureTriangles().\n");
-            
+
         RUN_CLIPPED (dst, NULL,
-                     dst->dfbsurface->TextureTriangles (dst->dfbsurface, src->dfbsurface, 
-                                                    vertex, NULL, n, DTTF_LIST));
-                                            
-        ret = CAIRO_STATUS_SUCCESS;
+                     dst->dfbsurface->TextureTriangles (dst->dfbsurface,
+							src->dfbsurface,
+							vertex, NULL, n,
+							DTTF_LIST));
+
+        status = CAIRO_STATUS_SUCCESS;
     }
-    
+
     _directfb_finish_composite (dst, pattern, &src->base, &src_attr);
 
-    return ret;
+    return status;
 }
 #endif /* DFB_COMPOSITE_TRAPEZOIDS */
 
 static cairo_int_status_t
 _cairo_directfb_surface_set_clip_region (void           *abstract_surface,
                                          cairo_region_t *region)
 {
     cairo_directfb_surface_t *surface = abstract_surface;
-    
-    D_DEBUG_AT (CairoDFB_Clip, 
-                "%s( surface=%p, region=%p ).\n",
-                __FUNCTION__, surface, region);
-    
+
+    D_DEBUG_AT (CairoDFB_Clip,
+		"%s( surface=%p, region=%p ).\n",
+		__FUNCTION__, surface, region);
+
     if (region) {
-        cairo_box_int_t *boxes;
-        int              n_boxes;
-        cairo_status_t   status;
-        int              i;
+	cairo_box_int_t *boxes;
+	int              n_boxes;
+	cairo_status_t   status;
+	int              i;
+
+	surface->has_clip = TRUE;
+
+	status = _cairo_region_get_boxes (region, &n_boxes, &boxes);
+	if (n_boxes == 0)
+	    return CAIRO_STATUS_SUCCESS;
+	if (status)
+	    return status;
+
+	if (surface->n_clips != n_boxes) {
+	    if (surface->clips)
+		free (surface->clips);
 
-        status = _cairo_region_get_boxes (region, &n_boxes, &boxes);
-        if (n_boxes == 0)
-            return CAIRO_STATUS_SUCCESS;
-        if (status)
-            return status;
-        
-        if (surface->n_clips != n_boxes) {
-            if (surface->clips)
-                free (surface->clips);
-            
-            surface->clips = _cairo_malloc_ab (n_boxes, sizeof(DFBRegion));
-            if (!surface->clips) {
-                surface->n_clips = 0;
-                _cairo_region_boxes_fini (region, boxes);
-                return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-            }
-        
-            surface->n_clips = n_boxes;
-        }
-        
-        for (i = 0; i < n_boxes; i++) {
-            surface->clips[i].x1 = boxes[i].p1.x;
-            surface->clips[i].y1 = boxes[i].p1.y;
-            surface->clips[i].x2 = boxes[i].p2.x;
-            surface->clips[i].y2 = boxes[i].p2.y;
-        }
+	    surface->clips = _cairo_malloc_ab (n_boxes, sizeof (DFBRegion));
+	    if (!surface->clips) {
+		surface->n_clips = 0;
+		_cairo_region_boxes_fini (region, boxes);
+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    }
+
+	    surface->n_clips = n_boxes;
+	}
 
-        _cairo_region_boxes_fini (region, boxes);
-    }
-    else {
-        if (surface->clips) {
-            free (surface->clips);
-            surface->clips = NULL;
-            surface->n_clips = 0;
-        }
+	for (i = 0; i < n_boxes; i++) {
+	    surface->clips[i].x1 = boxes[i].p1.x;
+	    surface->clips[i].y1 = boxes[i].p1.y;
+	    surface->clips[i].x2 = boxes[i].p2.x - 1;
+	    surface->clips[i].y2 = boxes[i].p2.y - 1;
+	}
+
+	_cairo_region_boxes_fini (region, boxes);
+    } else {
+	surface->has_clip = FALSE;
+	if (surface->clips) {
+	    free (surface->clips);
+	    surface->clips = NULL;
+	    surface->n_clips = 0;
+	}
     }
 
     return CAIRO_STATUS_SUCCESS;
 }
 
 static cairo_int_status_t
 _cairo_directfb_abstract_surface_get_extents (void                  *abstract_surface,
                                               cairo_rectangle_int_t *rectangle)
 {
     cairo_directfb_surface_t *surface = abstract_surface;
-    
+
     D_DEBUG_AT (CairoDFB_Surface,
-                "%s( surface=%p, rectangle=%p ).\n",
-                __FUNCTION__, surface, rectangle);
-    
-    if (rectangle) {
-        if (!surface->local) {
-            surface->dfbsurface->GetSize (surface->dfbsurface,
-                                          &surface->width, &surface->height);
-        }   
-        rectangle->x = 0;
-        rectangle->y = 0;
-        rectangle->width  = surface->width;
-        rectangle->height = surface->height;
+		"%s( surface=%p, rectangle=%p ).\n",
+		__FUNCTION__, surface, rectangle);
+
+    if (!surface->local) {
+	surface->dfbsurface->GetSize (surface->dfbsurface,
+				      &surface->width, &surface->height);
     }
-    
+
+    rectangle->x = 0;
+    rectangle->y = 0;
+    rectangle->width  = surface->width;
+    rectangle->height = surface->height;
+
     return CAIRO_STATUS_SUCCESS;
 }
 
 #if DFB_SHOW_GLYPHS
-static cairo_directfb_font_cache_t*
-_directfb_allocate_font_cache (IDirectFB *dfb, int width, int height)
+static cairo_status_t
+_directfb_allocate_font_cache (IDirectFB *dfb,
+			       int width, int height,
+			       cairo_directfb_font_cache_t **out)
 {
     cairo_directfb_font_cache_t *cache;
+    cairo_status_t status;
 
-    cache = calloc (1, sizeof(cairo_directfb_font_cache_t));
-    if (!cache)
-        return NULL;
+    cache = calloc (1, sizeof (cairo_directfb_font_cache_t));
+    if (cache == NULL)
+        return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
     cache->dfb = dfb;
-    cache->dfbsurface = _directfb_buffer_surface_create (dfb, 
-                            _directfb_argb_font ? DSPF_ARGB : DSPF_A8, width, height);
-    if (!cache->dfbsurface) {
+    status = _directfb_buffer_surface_create (dfb,
+                            _directfb_argb_font ? DSPF_ARGB : DSPF_A8,
+			    width, height,
+			    &cache->dfbsurface);
+    if (status) {
         free (cache);
-        return NULL;
+	return status;
     }
+
     cache->width  = width;
     cache->height = height;
-
-    return cache;
+    *out = cache;
+    return CAIRO_STATUS_SUCCESS;
 }
 
 static void
 _directfb_destroy_font_cache (cairo_directfb_font_cache_t *cache)
 {
     cache->dfbsurface->Release (cache->dfbsurface);
     free (cache);
 }
@@ -1366,374 +1412,400 @@ static void
 static cairo_status_t
 _directfb_acquire_font_cache (cairo_directfb_surface_t     *surface,
                               cairo_scaled_font_t          *scaled_font,
                               const cairo_glyph_t          *glyphs,
                               int                           num_glyphs,
                               cairo_directfb_font_cache_t **ret_cache,
                               DFBRectangle                 *rects,
                               DFBPoint                     *points,
-                              int                          *ret_num )
+			      int                          *ret_num)
 {
-    cairo_status_t               ret;
+    cairo_status_t               status;
     cairo_scaled_glyph_t        *chars[num_glyphs];
     int                          num_chars = 0;
-    cairo_directfb_font_cache_t *cache     = NULL; 
+    cairo_directfb_font_cache_t *cache     = NULL;
     int                          n         = 0;
     int                          x         = 0;
     int                          y         = 0;
     int                          w         = 8;
     int                          h         = 8;
     int                          i;
-    
+
     D_DEBUG_AT (CairoDFB_Font, "%s( %p [%d] )\n", __FUNCTION__, glyphs, num_glyphs );
 
+    _cairo_cache_freeze (scaled_font->glyphs);
+
     if (scaled_font->surface_private) {
-        cache = scaled_font->surface_private;
-        x = cache->x;
-        y = cache->y;
+	cache = scaled_font->surface_private;
+	x = cache->x;
+	y = cache->y;
     }
 
-    _cairo_cache_freeze( scaled_font->glyphs );
-
     for (i = 0; i < num_glyphs; i++) {
-        cairo_scaled_glyph_t  *scaled_glyph;
-        cairo_image_surface_t *img;
-        
-        D_DEBUG_AT (CairoDFB_Font, "  -> [%2d] = %4lu\n", i, glyphs[i].index );
+	cairo_scaled_glyph_t  *scaled_glyph;
+	cairo_image_surface_t *img;
+
+	D_DEBUG_AT (CairoDFB_Font, "  -> [%2d] = %4lu\n", i, glyphs[i].index );
+
+	status = _cairo_scaled_glyph_lookup (scaled_font, glyphs[i].index,
+					  CAIRO_SCALED_GLYPH_INFO_SURFACE,
+					  &scaled_glyph);
+	if (status) {
+	    _cairo_cache_thaw (scaled_font->glyphs);
+	    return status;
+	}
 
-        ret = _cairo_scaled_glyph_lookup (scaled_font, glyphs[i].index,
-                                          CAIRO_SCALED_GLYPH_INFO_SURFACE,
-                                          &scaled_glyph);
-        if (ret) {
-            _cairo_cache_thaw( scaled_font->glyphs );
-            return ret;
-        }
-        
-        img = scaled_glyph->surface;
-        switch (img->format) {
-            case CAIRO_FORMAT_A1:
-            case CAIRO_FORMAT_A8:
-            case CAIRO_FORMAT_ARGB32:
-                break;
-            default:
-                D_DEBUG_AT (CairoDFB_Font,
-                            "  -> Unsupported font format %d!\n", img->format);
-                _cairo_cache_thaw( scaled_font->glyphs );
-                return CAIRO_INT_STATUS_UNSUPPORTED;
-        }
-        
-        points[n].x = _cairo_lround (glyphs[i].x - img->base.device_transform.x0);
-        points[n].y = _cairo_lround (glyphs[i].y - img->base.device_transform.y0);
-        
-//        D_DEBUG_AT (CairoDFB_Font, "            (%4d,%4d) [%2d]\n", points[n].x, points[n].y, n );
+	img = scaled_glyph->surface;
+	switch (img->format) {
+	case CAIRO_FORMAT_A1:
+	case CAIRO_FORMAT_A8:
+	case CAIRO_FORMAT_ARGB32:
+	    break;
+	default:
+	    D_DEBUG_AT (CairoDFB_Font,
+			"  -> Unsupported font format %d!\n", img->format);
+	    _cairo_cache_thaw (scaled_font->glyphs);
+	    return CAIRO_INT_STATUS_UNSUPPORTED;
+	}
+
+	points[n].x = _cairo_lround (glyphs[i].x - img->base.device_transform.x0);
+	points[n].y = _cairo_lround (glyphs[i].y - img->base.device_transform.y0);
+
+	//        D_DEBUG_AT (CairoDFB_Font, "            (%4d,%4d) [%2d]\n", points[n].x, points[n].y, n );
+
+	if (points[n].x >= surface->width  ||
+	    points[n].y >= surface->height ||
+	    points[n].x+img->width  <= 0   ||
+	    points[n].y+img->height <= 0)
+	{
+	    continue;
+	}
+
+	if (scaled_glyph->surface_private == NULL) {
+	    DFBRectangle *rect;
 
-        if (points[n].x >= surface->width  ||
-            points[n].y >= surface->height ||
-            points[n].x+img->width  <= 0   ||
-            points[n].y+img->height <= 0)
-        {
-             D_DEBUG_AT (CairoDFB_Font,
-                         "  -> Unsupported font format %d!\n", img->format);
-             continue;
-        }
-        
-        if (!scaled_glyph->surface_private) {
-            DFBRectangle *rect;
-            
-            if (x+img->width > 2048) {
-                x = 0;
-                y = h;
-                h = 0;
-            }
-        
-            rects[n].x = x;
-            rects[n].y = y;
-            rects[n].w = img->width;
-            rects[n].h = img->height;
- 
-            x += img->width;
-            h  = MAX (h, img->height);
-            w  = MAX (w, x);
-            
-            /* Remember glyph location */ 
-            rect = malloc (sizeof(DFBRectangle));
-            if (!rect) {
-                _cairo_cache_thaw( scaled_font->glyphs );
-                return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-            }
-            *rect = rects[n];
-            
-            scaled_glyph->surface_private = rect;
-            chars[num_chars++] = scaled_glyph;
-            
-            D_DEBUG_AT (CairoDFB_Font, "  -> loading at %4d,%2d <- rect %p, img %p, entry %p\n",
-                        rects[n].x, rects[n].y, rect, scaled_glyph->surface, scaled_glyph);
-        }
-        else {
-            rects[n] = *((DFBRectangle *)scaled_glyph->surface_private);
-            
-            D_DEBUG_AT (CairoDFB_Font, "  -> exists at  %4d,%2d\n", rects[n].x, rects[n].y);
-        }
-            
-        n++;
+	    if (x+img->width > 2048) {
+		x = 0;
+		y = h;
+		h = 0;
+	    }
+
+	    rects[n].x = x;
+	    rects[n].y = y;
+	    rects[n].w = img->width;
+	    rects[n].h = img->height;
+
+	    x += img->width;
+	    h  = MAX (h, img->height);
+	    w  = MAX (w, x);
+
+	    /* Remember glyph location */
+	    rect = malloc (sizeof (DFBRectangle));
+	    if (rect == NULL) {
+		_cairo_cache_thaw (scaled_font->glyphs);
+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	    }
+	    *rect = rects[n];
+
+	    scaled_glyph->surface_private = rect;
+	    chars[num_chars++] = scaled_glyph;
+
+	    D_DEBUG_AT (CairoDFB_Font, "  -> loading at %4d,%2d <- rect %p, img %p, entry %p\n",
+			rects[n].x, rects[n].y, rect, scaled_glyph->surface, scaled_glyph);
+	} else {
+	    rects[n] = *(DFBRectangle *) scaled_glyph->surface_private;
+
+	    D_DEBUG_AT (CairoDFB_Font, "  -> exists at  %4d,%2d\n", rects[n].x, rects[n].y);
+	}
+
+	n++;
     }
-    
-    if (!n) {
-        _cairo_cache_thaw( scaled_font->glyphs );
-        return CAIRO_INT_STATUS_NOTHING_TO_DO;
+
+    if (n == 0) {
+	_cairo_cache_thaw (scaled_font->glyphs);
+	return CAIRO_INT_STATUS_NOTHING_TO_DO;
     }
-    
+
     h += y;
     w = MAX (w, 8);
     h = MAX (h, 8);
-     
-    if (cache) {
-        if (cache->width < w || cache->height < h) {
-            cairo_directfb_font_cache_t *new_cache;
-            
-            w = MAX (w, cache->width);
-            h = MAX (h, cache->height);
-            
-            D_DEBUG_AT (CairoDFB_Font, "  -> Reallocating font cache (%dx%d).\n", w, h);
-            
-            new_cache = _directfb_allocate_font_cache (surface->dfb, w, h);
-            if (!new_cache) {
-                _cairo_cache_thaw( scaled_font->glyphs );
-                return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-            }
-            
-            new_cache->dfbsurface->Blit (new_cache->dfbsurface,
-                                         cache->dfbsurface, NULL, 0, 0);
-            
-            _directfb_destroy_font_cache (cache);
-            scaled_font->surface_private = cache = new_cache;
-        }
+
+    /* XXX query maximum surface size */
+    if (w > 2048 || h > 2048) {
+	_cairo_cache_thaw (scaled_font->glyphs);
+	return CAIRO_INT_STATUS_UNSUPPORTED;
     }
-    else {
-        D_DEBUG_AT (CairoDFB_Font, "  -> Allocating font cache (%dx%d).\n", w, h);
-        
-        cache = _directfb_allocate_font_cache (surface->dfb, w, h);
-        if (!cache) {
-            _cairo_cache_thaw( scaled_font->glyphs );
-            return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        }
-            
-        scaled_font->surface_backend = &cairo_directfb_surface_backend;
-        scaled_font->surface_private = cache;
-    }
-    
-    if (num_chars) {
-        unsigned char *data;
-        int            pitch;
-    
-        if (cache->dfbsurface->Lock (cache->dfbsurface, 
-                                     DSLF_WRITE, (void *)&data, &pitch))
-        {
-            _cairo_cache_thaw( scaled_font->glyphs );
-            return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-        }
-            
-        D_DEBUG_AT (CairoDFB_Font, "  => %d chars to load, cache %dx%d\n", num_chars, cache->width, cache->height);
+
+    if (cache) {
+	if (cache->width < w || cache->height < h) {
+	    cairo_directfb_font_cache_t *new_cache;
+
+	    w = MAX (w, cache->width);
+	    h = MAX (h, cache->height);
+
+	    D_DEBUG_AT (CairoDFB_Font, "  -> Reallocating font cache (%dx%d).\n", w, h);
 
-        for (i = 0; i < num_chars; i++) {
-            cairo_image_surface_t *img  = chars[i]->surface;
-            DFBRectangle          *rect = chars[i]->surface_private;
-            unsigned char         *dst  = data;
-            unsigned char         *src;
-            int                    j;
-            
-            D_DEBUG_AT (CairoDFB_Font, "  -> loading [%2d] <- rect %p, img %p, entry %p\n", i, rect, img, chars[i]);
+	    status = _directfb_allocate_font_cache (surface->dfb,
+						    w, h,
+						    &new_cache);
+	    if (status) {
+		_cairo_cache_thaw (scaled_font->glyphs);
+		return status;
+	    }
 
-            src = img->data;
-
-            D_DEBUG_AT (CairoDFB_Font, "     from %p\n", src);
-
-            dst += rect->y * pitch + (_directfb_argb_font ? (rect->x<<2) : rect->x);
-                        
-            D_DEBUG_AT (CairoDFB_Font, "     to %4d,%2d (%p)\n", rect->x, rect->y, dst);
+	    new_cache->dfbsurface->Blit (new_cache->dfbsurface,
+					 cache->dfbsurface, NULL, 0, 0);
 
-            if (img->format == CAIRO_FORMAT_A1) {
-                for (h = rect->h; h; h--) {
-                    if (_directfb_argb_font) {
-                        for (j = 0; j < rect->w; j++)
-                            ((uint32_t *)dst)[j] = (src[j>>3] & (1 << (j&7))) ? 0xffffffff : 0;
-                    }
-                    else {
-                        for (j = 0; j < rect->w; j++)
-                            dst[j] = (src[j>>3] & (1 << (j&7))) ? 0xff : 0;
-                    }
-                    
-                    dst += pitch;
-                    src += img->stride;
-                }
-            }
-            else if (img->format == CAIRO_FORMAT_A8) {
-                for (h = rect->h; h; h--) {
-                    if (_directfb_argb_font) {
-                        for (j = 0; j < rect->w; j++)
-                            ((uint32_t *)dst)[j] = src[j] * 0x01010101;
-                    }
-                    else {
-                        direct_memcpy (dst, src, rect->w);
-                    }
-                    
-                    dst += pitch;
-                    src += img->stride;
-                }
-            }
-            else { /* ARGB32 */
-                for (h = rect->h; h; h--) {
-                    if (_directfb_argb_font) {
-                        direct_memcpy (dst, src, rect->w<<2);
-                    }
-                    else {
-                        for (j = 0; j < rect->w; j++)
-                            dst[j] = ((uint32_t *)src)[j] >> 24;
-                    }
-                    
-                    dst += pitch;
-                    src += img->stride;
-                }
-            }
-        }
-        
-        cache->dfbsurface->Unlock (cache->dfbsurface);
+	    _directfb_destroy_font_cache (cache);
+	    scaled_font->surface_private = cache = new_cache;
+	}
+    } else {
+	D_DEBUG_AT (CairoDFB_Font, "  -> Allocating font cache (%dx%d).\n", w, h);
+
+	status = _directfb_allocate_font_cache (surface->dfb, w, h, &cache);
+	if (status) {
+	    _cairo_cache_thaw (scaled_font->glyphs);
+	    return status;
+	}
+
+	scaled_font->surface_backend = &_cairo_directfb_surface_backend;
+	scaled_font->surface_private = cache;
     }
 
-    _cairo_cache_thaw( scaled_font->glyphs );
+    if (num_chars) {
+	unsigned char *data;
+	int            pitch;
+
+	if (cache->dfbsurface->Lock (cache->dfbsurface,
+				     DSLF_WRITE, (void *)&data, &pitch))
+	{
+	    _cairo_cache_thaw (scaled_font->glyphs);
+	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
+	}
+
+	D_DEBUG_AT (CairoDFB_Font, "  => %d chars to load, cache %dx%d\n", num_chars, cache->width, cache->height);
+
+	for (i = 0; i < num_chars; i++) {
+	    cairo_image_surface_t *img  = chars[i]->surface;
+	    DFBRectangle          *rect = chars[i]->surface_private;
+	    unsigned char         *dst  = data;
+	    unsigned char         *src;
+	    int                    j;
+
+	    D_DEBUG_AT (CairoDFB_Font, "  -> loading [%2d] <- rect %p, img %p, entry %p\n", i, rect, img, chars[i]);
+
+	    src = img->data;
+
+	    D_DEBUG_AT (CairoDFB_Font, "     from %p\n", src);
+
+	    dst += rect->y * pitch + (_directfb_argb_font ? (rect->x<<2) : rect->x);
+
+	    D_DEBUG_AT (CairoDFB_Font, "     to %4d,%2d (%p)\n", rect->x, rect->y, dst);
+
+	    if (img->format == CAIRO_FORMAT_A1) {
+		for (h = rect->h; h; h--) {
+		    if (_directfb_argb_font) {
+			for (j = 0; j < rect->w; j++)
+			    ((uint32_t *) dst)[j] = (src[j>>3] & (1 << (j&7))) ? 0xffffffff : 0;
+		    } else {
+			for (j = 0; j < rect->w; j++)
+			    dst[j] = (src[j>>3] & (1 << (j&7))) ? 0xff : 0;
+		    }
+
+		    dst += pitch;
+		    src += img->stride;
+		}
+	    } else if (img->format == CAIRO_FORMAT_A8) {
+		for (h = rect->h; h; h--) {
+		    if (_directfb_argb_font) {
+			for (j = 0; j < rect->w; j++)
+			    ((uint32_t *) dst)[j] = src[j] * 0x01010101;
+		    } else {
+			direct_memcpy (dst, src, rect->w);
+		    }
+
+		    dst += pitch;
+		    src += img->stride;
+		}
+	    } else { /* ARGB32 */
+		for (h = rect->h; h; h--) {
+		    if (_directfb_argb_font) {
+			direct_memcpy (dst, src, rect->w<<2);
+		    } else {
+			for (j = 0; j < rect->w; j++)
+			    dst[j] = ((uint32_t *) src)[j] >> 24;
+		    }
+
+		    dst += pitch;
+		    src += img->stride;
+		}
+	    }
+	}
+
+	cache->dfbsurface->Unlock (cache->dfbsurface);
+    }
+
+    _cairo_cache_thaw (scaled_font->glyphs);
 
     cache->x = x;
     cache->y = y;
-    
+
     D_DEBUG_AT (CairoDFB_Font, "  => cache %d,%d, %p [%d]\n", x, y, cache, n);
 
     *ret_cache = cache;
     *ret_num   = n;
 
     return CAIRO_STATUS_SUCCESS;
 }
 
 static void
 _cairo_directfb_surface_scaled_font_fini (cairo_scaled_font_t *scaled_font)
 {
     cairo_directfb_font_cache_t *cache = scaled_font->surface_private;
-    
+
     D_DEBUG_AT (CairoDFB_Font,
-                "%s( scaled_font=%p ).\n", __FUNCTION__, scaled_font);
-    
-    if (cache) {
-        _directfb_destroy_font_cache (cache);
-        scaled_font->surface_private = NULL;
+		"%s( scaled_font=%p ).\n", __FUNCTION__, scaled_font);
+
+    if (cache != NULL) {
+	_directfb_destroy_font_cache (cache);
+	scaled_font->surface_private = NULL;
     }
 }
 
 static void
 _cairo_directfb_surface_scaled_glyph_fini (cairo_scaled_glyph_t *scaled_glyph,
                                            cairo_scaled_font_t  *scaled_font)
 {
      D_DEBUG_AT (CairoDFB_Font,
                  "%s( scaled_glyph=%p, scaled_font=%p ).\n",
                  __FUNCTION__, scaled_glyph, scaled_font);
 
-     if (scaled_glyph->surface_private) {
+     if (scaled_glyph->surface_private != NULL) {
           free (scaled_glyph->surface_private);
           scaled_glyph->surface_private = NULL;
      }
 }
 
 static cairo_int_status_t
 _cairo_directfb_surface_show_glyphs (void                *abstract_dst,
                                      cairo_operator_t     op,
                                      cairo_pattern_t     *pattern,
                                      cairo_glyph_t       *glyphs,
                                      int                  num_glyphs,
                                      cairo_scaled_font_t *scaled_font,
 				     int		 *remaining_glyphs)
 {
     cairo_directfb_surface_t    *dst = abstract_dst;
     cairo_directfb_font_cache_t *cache;
-    cairo_status_t               ret;
+    cairo_status_t               status;
     DFBSurfaceBlittingFlags      flags;
     DFBSurfaceBlendFunction      sblend;
     DFBSurfaceBlendFunction      dblend;
-    DFBColor                     color;
     DFBRectangle                 rects[num_glyphs];
     DFBPoint                     points[num_glyphs];
     int                          num;
-    
+    const cairo_color_t         *color;
+
+
     D_DEBUG_AT (CairoDFB_Font,
-                "%s( dst=%p, op=%d, pattern=%p, glyphs=%p, num_glyphs=%d, scaled_font=%p ).\n",
-                __FUNCTION__, dst, op, pattern, glyphs, num_glyphs, scaled_font);
-                            
+		"%s( dst=%p, op=%d, pattern=%p, glyphs=%p, num_glyphs=%d, scaled_font=%p ).\n",
+		__FUNCTION__, dst, op, pattern, glyphs, num_glyphs, scaled_font);
+
     if (pattern->type != CAIRO_PATTERN_TYPE_SOLID)
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    /* Fallback if we need to emulate clip regions */
+    if (dst->base.clip &&
+        (dst->base.clip->mode != CAIRO_CLIP_MODE_REGION ||
+         dst->base.clip->surface != NULL))
+    {
         return CAIRO_INT_STATUS_UNSUPPORTED;
-        
-    if (_directfb_get_operator (op, &sblend, &dblend) ||
-        sblend == DSBF_DESTALPHA || sblend == DSBF_INVDESTALPHA) 
-        return CAIRO_INT_STATUS_UNSUPPORTED;
-        
-    ret = _directfb_acquire_font_cache (dst, scaled_font, glyphs, num_glyphs,
-                                        &cache, &rects[0], &points[0], &num);
-    if (ret) {
-        if (ret == CAIRO_INT_STATUS_NOTHING_TO_DO)
-            ret = CAIRO_STATUS_SUCCESS;
-        return ret;
     }
-        
-    color.a = ((cairo_solid_pattern_t *)pattern)->color.alpha_short >> 8;
-    color.r = ((cairo_solid_pattern_t *)pattern)->color.red_short   >> 8;
-    color.g = ((cairo_solid_pattern_t *)pattern)->color.green_short >> 8;
-    color.b = ((cairo_solid_pattern_t *)pattern)->color.blue_short  >> 8;
-    
+
+    /* XXX Unbounded operators are not handled correctly */
+    if (! _cairo_operator_bounded_by_mask (op))
+        return CAIRO_INT_STATUS_UNSUPPORTED;
+    if (! _cairo_operator_bounded_by_source (op))
+        return CAIRO_INT_STATUS_UNSUPPORTED;
+
+    if (! _directfb_get_operator (op, &sblend, &dblend) ||
+	sblend == DSBF_DESTALPHA || sblend == DSBF_INVDESTALPHA)
+    {
+	return CAIRO_INT_STATUS_UNSUPPORTED;
+    }
+
+    status = _directfb_acquire_font_cache (dst, scaled_font, glyphs, num_glyphs,
+					   &cache, &rects[0], &points[0], &num);
+    if (status) {
+	if (status == CAIRO_INT_STATUS_NOTHING_TO_DO)
+	    status = CAIRO_STATUS_SUCCESS;
+	return status;
+    }
+
+    color = &((cairo_solid_pattern_t *) pattern)->color;
+
     flags = DSBLIT_BLEND_ALPHACHANNEL | DSBLIT_COLORIZE;
-    if (color.a != 0xff)
-        flags |= DSBLIT_BLEND_COLORALPHA;
-        
+    if (! CAIRO_COLOR_IS_OPAQUE (color))
+	flags |= DSBLIT_BLEND_COLORALPHA;
+
     if (!_directfb_argb_font) {
-        if (sblend == DSBF_ONE) {
-            sblend = DSBF_SRCALPHA;
-            if (dblend == DSBF_ZERO)
-                dblend = DSBF_INVSRCALPHA;
-        }
-    } 
-        
+	if (sblend == DSBF_ONE) {
+	    sblend = DSBF_SRCALPHA;
+	    if (dblend == DSBF_ZERO)
+		dblend = DSBF_INVSRCALPHA;
+	}
+    }
+
     dst->dfbsurface->SetBlittingFlags (dst->dfbsurface, flags);
     dst->dfbsurface->SetSrcBlendFunction (dst->dfbsurface, sblend);
     dst->dfbsurface->SetDstBlendFunction (dst->dfbsurface, dblend);
-    dst->dfbsurface->SetColor (dst->dfbsurface, color.r, color.g, color.b, color.a);
-    
+    if (dst->blit_premultiplied) {
+	dst->dfbsurface->SetColor (dst->dfbsurface,
+				   color->red_short >> 8,
+				   color->green_short >> 8,
+				   color->blue_short >> 8,
+				   color->alpha_short >> 8);
+    } else {
+	dst->dfbsurface->SetColor (dst->dfbsurface,
+				   color->red * 0xff,
+				   color->green * 0xff,
+				   color->blue * 0xff,
+				   color->alpha * 0xff);
+    }
+
     D_DEBUG_AT (CairoDFB_Font, "Running BatchBlit().\n");
-        
+
     RUN_CLIPPED (dst, NULL,
-                 dst->dfbsurface->BatchBlit (dst->dfbsurface,
-                                         cache->dfbsurface, rects, points, num));
-        
+		 dst->dfbsurface->BatchBlit (dst->dfbsurface,
+					     cache->dfbsurface, rects, points, num));
+
     return CAIRO_STATUS_SUCCESS;
 }
 #endif /* DFB_SHOW_GLYPHS */
 
 
 static cairo_bool_t
 _cairo_directfb_surface_is_similar (void *surface_a, void *surface_b, cairo_content_t content)
 {
     cairo_directfb_surface_t *a = (cairo_directfb_surface_t *) surface_a;
     cairo_directfb_surface_t *b = (cairo_directfb_surface_t *) surface_b;
 
     return a->dfb == b->dfb;
 }
 
-static cairo_surface_backend_t cairo_directfb_surface_backend = {
+static cairo_surface_backend_t
+_cairo_directfb_surface_backend = {
          CAIRO_SURFACE_TYPE_DIRECTFB, /*type*/
         _cairo_directfb_surface_create_similar,/*create_similar*/
         _cairo_directfb_surface_finish, /*finish*/
         _cairo_directfb_surface_acquire_source_image,/*acquire_source_image*/
         _cairo_directfb_surface_release_source_image,/*release_source_image*/
         _cairo_directfb_surface_acquire_dest_image,/*acquire_dest_image*/
-        _cairo_directfb_surface_release_dest_image,/*release_dest_image*/ 
+        _cairo_directfb_surface_release_dest_image,/*release_dest_image*/
         _cairo_directfb_surface_clone_similar,/*clone_similar*/
 #if DFB_COMPOSITE
         _cairo_directfb_surface_composite,/*composite*/
 #else
         NULL,/*composite*/
 #endif
 #if DFB_RECTANGLES
         _cairo_directfb_surface_fill_rectangles,/*fill_rectangles*/
@@ -1775,83 +1847,86 @@ static cairo_surface_backend_t cairo_dir
         NULL /* reset */
 };
 
 
 static void
 cairo_directfb_surface_backend_init (IDirectFB *dfb)
 {
     static int done = 0;
-    
+
     if (done)
-        return;
-        
+	return;
+
     if (getenv ("CAIRO_DIRECTFB_NO_ACCEL")) {
 #if DFB_RECTANGLES
-        cairo_directfb_surface_backend.fill_rectangles = NULL;
+	_cairo_directfb_surface_backend.fill_rectangles = NULL;
 #endif
 #if DFB_COMPOSITE
-        cairo_directfb_surface_backend.composite = NULL;
+	_cairo_directfb_surface_backend.composite = NULL;
 #endif
 #if DFB_COMPOSITE_TRAPEZOIDS
-        cairo_directfb_surface_backend.composite_trapezoids = NULL;
+	_cairo_directfb_surface_backend.composite_trapezoids = NULL;
 #endif
 #if DFB_SHOW_GLYPHS
-        cairo_directfb_surface_backend.scaled_font_fini = NULL;
-        cairo_directfb_surface_backend.scaled_glyph_fini = NULL;
-        cairo_directfb_surface_backend.show_glyphs = NULL;
+	_cairo_directfb_surface_backend.scaled_font_fini = NULL;
+	_cairo_directfb_surface_backend.scaled_glyph_fini = NULL;
+	_cairo_directfb_surface_backend.show_glyphs = NULL;
 #endif
-        D_DEBUG_AT (CairoDFB_Surface, "Acceleration disabled.\n");
-    }
-    else {
-        DFBGraphicsDeviceDescription dsc;
-        
-        dfb->GetDeviceDescription (dfb, &dsc);
-    
+	D_DEBUG_AT (CairoDFB_Surface, "Acceleration disabled.\n");
+    } else {
+	DFBGraphicsDeviceDescription dsc;
+
+	dfb->GetDeviceDescription (dfb, &dsc);
+
 #if DFB_COMPOSITE
-//        if (!(dsc.acceleration_mask & DFXL_BLIT))
-//            cairo_directfb_surface_backend.composite = NULL;
+	//        if (!(dsc.acceleration_mask & DFXL_BLIT))
+	//            _cairo_directfb_surface_backend.composite = NULL;
 #endif
 
 #if DFB_COMPOSITE_TRAPEZOIDS
-//        if (!(dsc.acceleration_mask & DFXL_TEXTRIANGLES))
-//            cairo_directfb_surface_backend.composite_trapezoids = NULL;
+	//        if (!(dsc.acceleration_mask & DFXL_TEXTRIANGLES))
+	//            _cairo_directfb_surface_backend.composite_trapezoids = NULL;
 #endif
     }
-    
+
     if (getenv ("CAIRO_DIRECTFB_ARGB_FONT")) {
-        _directfb_argb_font = 1;
-        D_DEBUG_AT (CairoDFB_Surface, "Using ARGB fonts.\n");
+	_directfb_argb_font = 1;
+	D_DEBUG_AT (CairoDFB_Surface, "Using ARGB fonts.\n");
     }
 
     done = 1;
-}   
-
+}
 
 cairo_surface_t *
-cairo_directfb_surface_create (IDirectFB *dfb, IDirectFBSurface *dfbsurface) 
+cairo_directfb_surface_create (IDirectFB *dfb, IDirectFBSurface *dfbsurface)
 {
     cairo_directfb_surface_t *surface;
     DFBSurfacePixelFormat     format;
-   
+    DFBSurfaceCapabilities caps;
+
     D_ASSERT (dfb != NULL);
     D_ASSERT (dfbsurface != NULL);
 
     cairo_directfb_surface_backend_init (dfb);
-        
-    surface = calloc (1, sizeof(cairo_directfb_surface_t));
-    if (!surface)
-        return NULL;
-     
-    dfbsurface->AddRef (dfbsurface);   
+
+    surface = calloc (1, sizeof (cairo_directfb_surface_t));
+    if (surface == NULL)
+        return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY));
+
+    dfbsurface->AddRef (dfbsurface);
     dfbsurface->GetPixelFormat (dfbsurface, &format);
     dfbsurface->GetSize (dfbsurface, &surface->width, &surface->height);
     surface->dfb = dfb;
-    surface->dfbsurface = dfbsurface;  
+    surface->dfbsurface = dfbsurface;
     surface->format = _directfb_to_cairo_format (format);
     surface->content = _directfb_format_to_content (format);
 
-    _cairo_surface_init (&surface->base, 
-                         &cairo_directfb_surface_backend, surface->content);  
+    dfbsurface->GetCapabilities (dfbsurface, &caps);
+    if (caps & DSCAPS_PREMULTIPLIED)
+	surface->blit_premultiplied = TRUE;
+
+    _cairo_surface_init (&surface->base,
+                         &_cairo_directfb_surface_backend,
+			 surface->content);
 
     return &surface->base;
 }
-