From 9eb9cc44aa1b7dcb5b3bef86b3ae620e1d0d789c Mon Sep 17 00:00:00 2001 From: Přemysl Eric Janouch Date: Mon, 13 Dec 2021 17:39:15 +0100 Subject: Clean up --- fastiv-io.c | 6 ++++-- tools/jpeginfo.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fastiv-io.c b/fastiv-io.c index 99a48e5..f99c385 100644 --- a/fastiv-io.c +++ b/fastiv-io.c @@ -1283,19 +1283,22 @@ open_libwebp(const gchar *data, gsize len, const gchar *path, GError **error) goto fail; } + // Releasing the demux chunk iterator is actually a no-op. + WebPChunkIterator chunk_iter = {}; uint32_t flags = WebPDemuxGetI(demux, WEBP_FF_FORMAT_FLAGS); - WebPChunkIterator chunk_iter; if ((flags & ICCP_FLAG) && WebPDemuxGetChunk(demux, "ICCP", 1, &chunk_iter)) { cairo_surface_set_user_data(result, &fastiv_io_key_icc, g_bytes_new(chunk_iter.chunk.bytes, chunk_iter.chunk.size), (cairo_destroy_func_t) g_bytes_unref); + WebPDemuxReleaseChunkIterator(&chunk_iter); } if ((flags & EXIF_FLAG) && WebPDemuxGetChunk(demux, "EXIF", 1, &chunk_iter)) { cairo_surface_set_user_data(result, &fastiv_io_key_exif, g_bytes_new(chunk_iter.chunk.bytes, chunk_iter.chunk.size), (cairo_destroy_func_t) g_bytes_unref); + WebPDemuxReleaseChunkIterator(&chunk_iter); } if (flags & ANIMATION_FLAG) { cairo_surface_set_user_data(result, &fastiv_io_key_loops, @@ -1303,7 +1306,6 @@ open_libwebp(const gchar *data, gsize len, const gchar *path, GError **error) NULL); } - WebPDemuxReleaseChunkIterator(&chunk_iter); WebPDemuxDelete(demux); fail: diff --git a/tools/jpeginfo.c b/tools/jpeginfo.c index 7836926..d3d9b59 100644 --- a/tools/jpeginfo.c +++ b/tools/jpeginfo.c @@ -20,9 +20,10 @@ #include #include +#include +#include #include #include -#include // --- ICC profiles ------------------------------------------------------------ // v2 https://www.color.org/ICC_Minor_Revision_for_Web.pdf -- cgit v1.2.3-70-g09d2