Include tooltip for Filter combo

[geeqie.git] / src / image-load-heif.cc

diff --git a/src/image-load-heif.cc b/src/image-load-heif.cc
index c877e5a..0996aff 100644 (file)
--- a/src/image-load-heif.cc
+++ b/src/image-load-heif.cc
@@ -22,12 +22,11 @@
 
 #include "image-load.h"
 #include "image-load-heif.h"
-
+#include <vector>
 #ifdef HAVE_HEIF
 #include <libheif/heif.h>
 
-typedef struct _ImageLoaderHEIF ImageLoaderHEIF;
-struct _ImageLoaderHEIF {
+struct ImageLoaderHEIF {
        ImageLoaderBackendCbAreaUpdated area_updated_cb;
        ImageLoaderBackendCbSize size_cb;
        ImageLoaderBackendCbAreaPrepared area_prepared_cb;
@@ -40,14 +39,14 @@ struct _ImageLoaderHEIF {
        gint page_total;
 };
 
-static void free_buffer(guchar *UNUSED(pixels), gpointer data)
+static void free_buffer(guchar *, gpointer data)
 {
-       heif_image_release((const struct heif_image*)data);
+       heif_image_release(static_cast<const struct heif_image*>(data));
 }
 
-static gboolean image_loader_heif_load(gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
+static gboolean image_loader_heif_load(gpointer loader, const guchar *buf, gsize count, GError **)
 {
-       ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
+       auto ld = static_cast<ImageLoaderHEIF *>(loader);
        struct heif_context* ctx;
        struct heif_image* img;
        struct heif_error error_code;
@@ -60,7 +59,7 @@ static gboolean image_loader_heif_load(gpointer loader, const guchar *buf, gsize
 
        ctx = heif_context_alloc();
 
-       error_code = heif_context_read_from_memory_without_copy(ctx, buf, count, NULL);
+       error_code = heif_context_read_from_memory_without_copy(ctx, buf, count, nullptr);
        if (error_code.code)
                {
                log_printf("warning: heif reader error: %s\n", error_code.message);
@@ -72,10 +71,10 @@ static gboolean image_loader_heif_load(gpointer loader, const guchar *buf, gsize
                page_total = heif_context_get_number_of_top_level_images(ctx);
                ld->page_total = page_total;
 
-               guint32 IDs[page_total * sizeof(guint32)];
+               std::vector<heif_item_id> IDs(page_total);
 
                /* get list of all (top level) image IDs */
-               heif_context_get_list_of_top_level_image_IDs(ctx, IDs, page_total);
+               heif_context_get_list_of_top_level_image_IDs(ctx, IDs.data(), page_total);
 
                error_code = heif_context_get_image_handle(ctx, IDs[ld->page_num], &handle);
                if (error_code.code)
@@ -86,7 +85,7 @@ static gboolean image_loader_heif_load(gpointer loader, const guchar *buf, gsize
                        }
 
                // decode the image and convert colorspace to RGB, saved as 24bit interleaved
-               error_code = heif_decode_image(handle, &img, heif_colorspace_RGB, heif_chroma_interleaved_24bit, NULL);
+               error_code = heif_decode_image(handle, &img, heif_colorspace_RGB, heif_chroma_interleaved_24bit, nullptr);
                if (error_code.code)
                        {
                        log_printf("warning: heif reader error: %s\n", error_code.message);
@@ -113,67 +112,67 @@ static gboolean image_loader_heif_load(gpointer loader, const guchar *buf, gsize
 
 static gpointer image_loader_heif_new(ImageLoaderBackendCbAreaUpdated area_updated_cb, ImageLoaderBackendCbSize size_cb, ImageLoaderBackendCbAreaPrepared area_prepared_cb, gpointer data)
 {
-       ImageLoaderHEIF *loader = g_new0(ImageLoaderHEIF, 1);
+       auto loader = g_new0(ImageLoaderHEIF, 1);
        loader->area_updated_cb = area_updated_cb;
        loader->size_cb = size_cb;
        loader->area_prepared_cb = area_prepared_cb;
        loader->data = data;
        loader->page_num = 0;
-       return (gpointer) loader;
+       return loader;
 }
 
 static void image_loader_heif_set_size(gpointer loader, int width, int height)
 {
-       ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
+       auto ld = static_cast<ImageLoaderHEIF *>(loader);
        ld->requested_width = width;
        ld->requested_height = height;
 }
 
 static GdkPixbuf* image_loader_heif_get_pixbuf(gpointer loader)
 {
-       ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
+       auto ld = static_cast<ImageLoaderHEIF *>(loader);
        return ld->pixbuf;
 }
 
-static gchar* image_loader_heif_get_format_name(gpointer UNUSED(loader))
+static gchar* image_loader_heif_get_format_name(gpointer)
 {
        return g_strdup("heif");
 }
 
-static gchar** image_loader_heif_get_format_mime_types(gpointer UNUSED(loader))
+static gchar** image_loader_heif_get_format_mime_types(gpointer)
 {
-       static gchar *mime[] = {"image/heic", NULL};
-       return g_strdupv(mime);
+       static const gchar *mime[] = {"image/heic", nullptr};
+       return g_strdupv(const_cast<gchar **>(mime));
 }
 
 static void image_loader_heif_set_page_num(gpointer loader, gint page_num)
 {
-       ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
+       auto ld = static_cast<ImageLoaderHEIF *>(loader);
 
        ld->page_num = page_num;
 }
 
 static gint image_loader_heif_get_page_total(gpointer loader)
 {
-       ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
+       auto ld = static_cast<ImageLoaderHEIF *>(loader);
 
        return ld->page_total;
 }
 
-static gboolean image_loader_heif_close(gpointer UNUSED(loader), GError **UNUSED(error))
+static gboolean image_loader_heif_close(gpointer, GError **)
 {
        return TRUE;
 }
 
 static void image_loader_heif_abort(gpointer loader)
 {
-       ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
+       auto ld = static_cast<ImageLoaderHEIF *>(loader);
        ld->abort = TRUE;
 }
 
 static void image_loader_heif_free(gpointer loader)
 {
-       ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
+       auto ld = static_cast<ImageLoaderHEIF *>(loader);
        if (ld->pixbuf) g_object_unref(ld->pixbuf);
        g_free(ld);
 }
@@ -183,7 +182,7 @@ void image_loader_backend_set_heif(ImageLoaderBackend *funcs)
        funcs->loader_new = image_loader_heif_new;
        funcs->set_size = image_loader_heif_set_size;
        funcs->load = image_loader_heif_load;
-       funcs->write = NULL;
+       funcs->write = nullptr;
        funcs->get_pixbuf = image_loader_heif_get_pixbuf;
        funcs->close = image_loader_heif_close;
        funcs->abort = image_loader_heif_abort;