[cairo-commit] 2 commits - src/cairo-damage.c

[Chris Wilson]

 src/cairo-damage.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 9ecf2f7c4f6451d4a2c145a82184ba185be0a421
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 10 21:01:36 2012 +0100

    damage: Prevent reducing an error object
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-damage.c b/src/cairo-damage.c
index 1809005..06ef9fd 100644
--- a/src/cairo-damage.c
+++ b/src/cairo-damage.c
@@ -185,7 +185,7 @@ _cairo_damage_reduce (cairo_damage_t *damage)
 
     TRACE ((stderr, "%s: dirty=%d\n", __FUNCTION__,
 	    damage ? damage->dirty : -1));
-    if (damage == NULL || !damage->dirty)
+    if (damage == NULL || damage->status || !damage->dirty)
 	return damage;
 
     if (damage->region) {
commit f4631dca371865f9aa747c61937c09d495f165e0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu May 10 21:00:49 2012 +0100

    damage: Prevent accumulating damage to an error object
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-damage.c b/src/cairo-damage.c
index 269f6df..1809005 100644
--- a/src/cairo-damage.c
+++ b/src/cairo-damage.c
@@ -92,6 +92,9 @@ _cairo_damage_add_boxes(cairo_damage_t *damage,
 
     if (damage == NULL)
 	damage = _cairo_damage_create ();
+    if (damage->status)
+	return damage;
+
 
     damage->dirty += count;