fix memory leak

diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c
index f6de70c5ab28607d98c7ea62c96f8319fe3ba46d..ccab28b521a8f771ab3a29f8a727b5279dbf3825 100644 (file)
--- a/lib/gvc/gvrender.c
+++ b/lib/gvc/gvrender.c
@@ -118,23 +118,23 @@ void gvrender_begin_job(GVJ_t * job)
 {
     gvrender_engine_t *gvre = job->render.engine;
 
-    gvdevice_initialize(job);
     if (gvre) {
         if (gvre->begin_job)
            gvre->begin_job(job);
     }
+    gvdevice_initialize(job);
 }
 
 void gvrender_end_job(GVJ_t * job)
 {
     gvrender_engine_t *gvre = job->render.engine;
 
+    gvdevice_finalize(job);
     if (gvre) {
                if (gvre->end_job)
            gvre->end_job(job);
     }
     job->gvc->common.lib = NULL;    /* FIXME - minimally this doesn't belong here */
-    gvdevice_finalize(job);
 }
 
 /* font modifiers */

diff --git a/plugin/pango/gvrender_pango.c b/plugin/pango/gvrender_pango.c
index cca99d02aada8528d1f9d8b345367f2f9bf58aad..af6aa7241493a82508ca7eaf8f4cbbbd3a105c3b 100644 (file)
--- a/plugin/pango/gvrender_pango.c
+++ b/plugin/pango/gvrender_pango.c
@@ -77,22 +77,34 @@ writer (void *closure, const unsigned char *data, unsigned int length)
     return CAIRO_STATUS_WRITE_ERROR;
 }
 
+static void cairogen_begin_job(GVJ_t * job)
+{
+    if (job->external_context && job->context)
+        cairo_save((cairo_t *) job->context);
+}
+
+static void cairogen_end_job(GVJ_t * job)
+{
+    cairo_t *cr = (cairo_t *) job->context;
+    
+    if (job->external_context)
+        cairo_restore(cr);
+    else {
+       cairo_destroy(cr);
+        job->context = NULL;
+    }
+}
+
 #define CAIRO_XMAX 32767
 #define CAIRO_YMAX 32767
 
 static void cairogen_begin_page(GVJ_t * job)
 {
-    cairo_t *cr = NULL;
+    cairo_t *cr = (cairo_t *) job->context;
     cairo_surface_t *surface;
     cairo_status_t status;
 
-    if (job->context) 
-       cr = (cairo_t *) job->context;
-    if (job->external_context && cr)
-        cairo_save(cr);
-    else {
-       if (cr)
-           cairo_destroy(cr);
+    if (cr == NULL) {
         switch (job->render.id) {
         case FORMAT_PS:
 #ifdef CAIRO_HAS_PS_SURFACE
@@ -142,7 +154,6 @@ static void cairogen_begin_page(GVJ_t * job)
                        job->common->cmdname,
                        cairo_status_to_string(status));
                cairo_surface_destroy (surface);
-               job->context = NULL;
                return;
        }
         cr = cairo_create(surface);
@@ -179,8 +190,6 @@ static void cairogen_end_page(GVJ_t * job)
     case FORMAT_SVG:
        cairo_show_page(cr);
        surface = cairo_surface_reference(cairo_get_target(cr));
-       cairo_destroy(cr);
-       job->context = NULL;
        cairo_surface_finish(surface);
        status = cairo_surface_status(surface);
        cairo_surface_destroy(surface);
@@ -195,9 +204,6 @@ static void cairogen_end_page(GVJ_t * job)
        break;
                /* formatting will be done by gvdevice_format() */
     }
-
-    if (job->external_context)
-       cairo_restore(cr);
 }
 
 static void cairogen_textpara(GVJ_t * job, pointf p, textpara_t * para)
@@ -334,8 +340,8 @@ cairogen_polyline(GVJ_t * job, pointf * A, int n)
 }
 
 static gvrender_engine_t cairogen_engine = {
-    0,                         /* cairogen_begin_job */
-    0,                         /* cairogen_end_job */
+    cairogen_begin_job,
+    cairogen_end_job,
     0,                         /* cairogen_begin_graph */
     0,                         /* cairogen_end_graph */
     0,                         /* cairogen_begin_layer */