diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2014-09-28 14:59:05 +0200 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2014-09-28 14:59:05 +0200 |
| commit | 2931d57e2bb25d44e6b70e18935fe1530b8dd4a5 (patch) | |
| tree | 8c5f1d44963e6bce76d8802804fc2b5883b9cfbe /tests | |
| parent | bee5e2fd263d81b7dc8180e831cbc96500cece1f (diff) | |
SCEditor, part III
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/render_test.c | 10 | ||||
| -rw-r--r-- | tests/render_test_sc1.c | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/tests/render_test.c b/tests/render_test.c index eec2be2..eab6108 100644 --- a/tests/render_test.c +++ b/tests/render_test.c @@ -49,6 +49,7 @@ static gint mw_destroy(GtkWidget *w, void *p) static gboolean draw_sig(GtkWidget *da, cairo_t *cr, gpointer data) { gint w, h; + cairo_surface_t *surface; struct slide *s = data; w = gtk_widget_get_allocated_width(da); @@ -59,11 +60,11 @@ static gboolean draw_sig(GtkWidget *da, cairo_t *cr, gpointer data) cairo_set_source_rgb(cr, 0.9, 0.9, 0.9); cairo_fill(cr); - if ( s->rendered_edit != NULL ) cairo_surface_destroy(s->rendered_edit); - s->rendered_edit = render_slide(s, w, w, h, NULL, ISZ_EDITOR, 1); + surface = render_slide(s, w, w, h, NULL, ISZ_EDITOR, 1); cairo_rectangle(cr, 0.0, 0.0, w, h); - cairo_set_source_surface(cr, s->rendered_edit, 0.0, 0.0); + cairo_set_source_surface(cr, surface, 0.0, 0.0); cairo_fill(cr); + cairo_surface_destroy(surface); return FALSE; } @@ -93,9 +94,6 @@ int main(int argc, char *argv[]) fr->pad_b = 20.0; s.top = fr; - s.rendered_edit = NULL; - s.rendered_proj = NULL; - s.rendered_thumb = NULL; s.parent = &p; s.scblocks = fr->scblocks; diff --git a/tests/render_test_sc1.c b/tests/render_test_sc1.c index d8172cd..590f21e 100644 --- a/tests/render_test_sc1.c +++ b/tests/render_test_sc1.c @@ -47,6 +47,7 @@ static gint mw_destroy(GtkWidget *w, void *p) static gboolean draw_sig(GtkWidget *da, cairo_t *cr, gpointer data) { gint w, h; + cairo_surface_t *surface; struct slide *s = data; w = gtk_widget_get_allocated_width(da); @@ -57,11 +58,11 @@ static gboolean draw_sig(GtkWidget *da, cairo_t *cr, gpointer data) cairo_set_source_rgb(cr, 0.9, 0.9, 0.9); cairo_fill(cr); - if ( s->rendered_edit != NULL ) cairo_surface_destroy(s->rendered_edit); - s->rendered_edit = render_slide(s, w, w, h, NULL, ISZ_EDITOR, 1); + surface = render_slide(s, w, w, h, NULL, ISZ_EDITOR, 1); cairo_rectangle(cr, 0.0, 0.0, w, h); - cairo_set_source_surface(cr, s->rendered_edit, 0.0, 0.0); + cairo_set_source_surface(cr, surface, 0.0, 0.0); cairo_fill(cr); + cairo_surface_destroy(surface); return FALSE; } @@ -91,9 +92,6 @@ int main(int argc, char *argv[]) fr->pad_b = 20.0; s.top = fr; - s.rendered_edit = NULL; - s.rendered_proj = NULL; - s.rendered_thumb = NULL; s.parent = &p; s.scblocks = fr->scblocks; |