From bb82b9fabc00e1fadca6fe630e91f07dbe1168b3 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sat, 22 Feb 2020 00:23:19 +0100 Subject: sixel: add sixel_destroy() --- sixel.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'sixel.c') diff --git a/sixel.c b/sixel.c index 4bb7a28e..fdad65a9 100644 --- a/sixel.c +++ b/sixel.c @@ -37,14 +37,22 @@ sixel_init(struct terminal *term) /* TODO: default palette */ } +void +sixel_destroy(struct sixel *sixel) +{ + pixman_image_unref(sixel->pix); + free(sixel->data); + + sixel->pix = NULL; + sixel->data = NULL; +} + void sixel_unhook(struct terminal *term) { free(term->sixel.palette); term->sixel.palette = NULL; - LOG_DBG("generating %dx%d pixman image", term->sixel.row * 6, term->sixel.max_col); - if (term->sixel.col > term->sixel.max_col) term->sixel.max_col = term->sixel.col; term->sixel.row++; @@ -58,6 +66,8 @@ sixel_unhook(struct terminal *term) .pos = (struct coord){term->cursor.point.col, term->grid->offset + term->cursor.point.row}, }; + LOG_DBG("generating %dx%d pixman image", image.width, image.height); + image.pix = pixman_image_create_bits_no_clear( PIXMAN_a8r8g8b8, image.width, image.height, @@ -66,8 +76,7 @@ sixel_unhook(struct terminal *term) tll_foreach(term->sixel_images, it) { if (it->item.pos.row == image.pos.row) { - pixman_image_unref(it->item.pix); - free(it->item.data); + sixel_destroy(&it->item); tll_remove(term->sixel_images, it); } } -- cgit v1.3