[cairo-commit] 2 commits - src/cairo-gl-surface.c util/cairo-script

[Chris Wilson]

 src/cairo-gl-surface.c                     |    3 +++
 util/cairo-script/cairo-script-operators.c |    1 +
 2 files changed, 4 insertions(+)

New commits:
commit 6826f020014fff566678a1ff92014211e2a21d4c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Apr 14 19:33:34 2010 +0100

    gl: Don't write error status to the inert object.
    
    Reported-by: Benjamin Otte <otte at redhat.com>

diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
index 708bf34..1fef8ab 100644
--- a/src/cairo-gl-surface.c
+++ b/src/cairo-gl-surface.c
@@ -611,6 +611,9 @@ cairo_gl_surface_set_size (cairo_surface_t *abstract_surface,
     cairo_gl_surface_t *surface = (cairo_gl_surface_t *) abstract_surface;
     cairo_status_t status;
 
+    if (unlikely (abstract_surface->status))
+	return;
+
     if (! _cairo_surface_is_gl (abstract_surface) || surface->fb) {
 	status = _cairo_surface_set_error (abstract_surface,
 		                           CAIRO_STATUS_SURFACE_TYPE_MISMATCH);
commit 3814855a649ffca695ce31d97c291496e32d2e26
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Apr 14 20:22:14 2010 +0100

    script: Flush prior to modifying the image data.

diff --git a/util/cairo-script/cairo-script-operators.c b/util/cairo-script/cairo-script-operators.c
index 389249f..b4a1a95 100644
--- a/util/cairo-script/cairo-script-operators.c
+++ b/util/cairo-script/cairo-script-operators.c
@@ -5005,6 +5005,7 @@ _set_source_image (csi_t *ctx)
      * principally to remove the pixman ops from the profiles.
      */
     if (_csi_likely (_matching_images (surface, source))) {
+	cairo_surface_flush (surface);
 	memcpy (cairo_image_surface_get_data (surface),
 		cairo_image_surface_get_data (source),
 		cairo_image_surface_get_height (source) * cairo_image_surface_get_stride (source));