[cairo-commit] src/cairo-surface-subsurface.c

[Chris Wilson]

 src/cairo-surface-subsurface.c |   14 --------------
 1 file changed, 14 deletions(-)

New commits:
commit 44a868b552f0cbf22f35e8a4e4e0daee555344a3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Nov 23 14:28:27 2011 +0000

    subsurface: And remove the dead code for releasing complex source
    
    Following the previous commit, we only allocate a simple image when
    acquiring the source so we only need to unreference it upon release.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-surface-subsurface.c b/src/cairo-surface-subsurface.c
index 3459c53..49f181c 100644
--- a/src/cairo-surface-subsurface.c
+++ b/src/cairo-surface-subsurface.c
@@ -284,11 +284,6 @@ _cairo_surface_subsurface_get_font_options (void *abstract_surface,
 	surface->target->backend->get_font_options (surface->target, options);
 }
 
-struct extra {
-    cairo_image_surface_t *image;
-    void *image_extra;
-};
-
 static cairo_status_t
 _cairo_surface_subsurface_acquire_source_image (void                    *abstract_surface,
 						cairo_image_surface_t  **image_out,
@@ -329,15 +324,6 @@ _cairo_surface_subsurface_release_source_image (void                   *abstract
 						cairo_image_surface_t  *image,
 						void                   *abstract_extra)
 {
-    cairo_surface_subsurface_t *surface = abstract_surface;
-
-    if (abstract_extra != NULL) {
-	struct extra *extra = abstract_extra;
-
-	_cairo_surface_release_source_image (surface->target, extra->image, extra->image_extra);
-	free (extra);
-    }
-
     cairo_surface_destroy (&image->base);
 }