Mercurial > hg > forks > geeqie
changeset 2383:9167a360c4b3
Merge remote-tracking branch 'github/merge-requests/428'
* github/merge-requests/428:
Wrap cairo_destroy call with appropriate CPP macro
Fix memory leak
| author | Klaus Ethgen <Klaus@Ethgen.de> |
|---|---|
| date | Mon, 22 Aug 2016 15:03:10 +0100 |
| parents | f2edd24e9248 (current diff) afdcce9187d9 (diff) |
| children | 82d8d3deae03 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cellrenderericon.c Fri Aug 19 07:03:41 2016 +0100 +++ b/src/cellrenderericon.c Mon Aug 22 15:03:10 2016 +0100 @@ -692,7 +692,9 @@ if (!pixbuf && !text) { +#if !GTK_CHECK_VERSION(3,0,0) cairo_destroy(cr); +#endif return; }
--- a/src/renderer-tiles.c Fri Aug 19 07:03:41 2016 +0100 +++ b/src/renderer-tiles.c Mon Aug 22 15:03:10 2016 +0100 @@ -222,9 +222,9 @@ cairo_set_source_rgb(cr, (double)pr->color.red/65535, (double)pr->color.green/65535, (double)pr->color.blue/65535); cairo_rectangle(cr, rx + rt->stereo_off_x, ry + rt->stereo_off_y, rw, rh); cairo_fill(cr); - cairo_destroy(cr); rt_overlay_draw(rt, rx, ry, rw, rh, NULL); } + cairo_destroy(cr); return; }