Convert group_keys to std::array

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

diff --git a/src/image-load-external.cc b/src/image-load-external.cc
index c4f6d3a..83b5080 100644 (file)
--- a/src/image-load-external.cc
+++ b/src/image-load-external.cc
@@ -18,30 +18,42 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
-
-#include "image-load.h"
 #include "image-load-external.h"
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <glib-object.h>
+#include <glib.h>
+
+#include "filedata.h"
+#include "image-load.h"
 #include "misc.h"
+#include "options.h"
 #include "ui-fileops.h"
 
-typedef struct _ImageLoaderExternal ImageLoaderExternal;
-struct _ImageLoaderExternal {
-       ImageLoaderBackendCbAreaUpdated area_updated_cb;
-       ImageLoaderBackendCbSize size_cb;
-       ImageLoaderBackendCbAreaPrepared area_prepared_cb;
+namespace
+{
+
+struct ImageLoaderExternal : public ImageLoaderBackend
+{
+public:
+       ~ImageLoaderExternal() override;
+
+       void init(AreaUpdatedCb area_updated_cb, SizePreparedCb size_prepared_cb, AreaPreparedCb area_prepared_cb, gpointer data) override;
+       gboolean write(const guchar *buf, gsize &chunk_size, gsize count, GError **error) override;
+       GdkPixbuf *get_pixbuf() override;
+       gchar *get_format_name() override;
+       gchar **get_format_mime_types() override;
+
+private:
+       AreaUpdatedCb area_updated_cb;
        gpointer data;
+
        GdkPixbuf *pixbuf;
-       guint requested_width;
-       guint requested_height;
-       gboolean abort;
 };
 
-static gboolean image_loader_external_load(gpointer loader, const guchar *UNUSED(buf), gsize UNUSED(count), GError **UNUSED(error))
+gboolean ImageLoaderExternal::write(const guchar *, gsize &chunk_size, gsize count, GError **)
 {
-       auto ld = (ImageLoaderExternal *) loader;
-       auto il = static_cast<ImageLoader *>(ld->data);
+       auto il = static_cast<ImageLoader *>(data);
        gchar *cmd_line;
        gchar *randname;
        gchar *tilde_filename;
@@ -55,83 +67,51 @@ static gboolean image_loader_external_load(gpointer loader, const guchar *UNUSED
 
        runcmd(cmd_line);
 
-       ld->pixbuf = gdk_pixbuf_new_from_file(randname, NULL);
+       pixbuf = gdk_pixbuf_new_from_file(randname, nullptr);
 
-       ld->area_updated_cb(loader, 0, 0, gdk_pixbuf_get_width(ld->pixbuf), gdk_pixbuf_get_height(ld->pixbuf), ld->data);
+       area_updated_cb(nullptr, 0, 0, gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf), data);
 
        g_free(cmd_line);
        unlink_file(randname);
        g_free(randname);
        g_free(tilde_filename);
 
+       chunk_size = count;
        return TRUE;
 }
 
-static gpointer image_loader_external_new(ImageLoaderBackendCbAreaUpdated area_updated_cb, ImageLoaderBackendCbSize size_cb, ImageLoaderBackendCbAreaPrepared area_prepared_cb, gpointer data)
+void ImageLoaderExternal::init(AreaUpdatedCb area_updated_cb, SizePreparedCb, AreaPreparedCb, gpointer data)
 {
-       auto loader = g_new0(ImageLoaderExternal, 1);
-       loader->area_updated_cb = area_updated_cb;
-       loader->size_cb = size_cb;
-       loader->area_prepared_cb = area_prepared_cb;
-       loader->data = data;
-       return (gpointer) loader;
+       this->area_updated_cb = area_updated_cb;
+       this->data = data;
 }
 
-static void image_loader_external_set_size(gpointer loader, int width, int height)
+GdkPixbuf *ImageLoaderExternal::get_pixbuf()
 {
-       auto ld = (ImageLoaderExternal *) loader;
-       ld->requested_width = width;
-       ld->requested_height = height;
+       return pixbuf;
 }
 
-static GdkPixbuf* image_loader_external_get_pixbuf(gpointer loader)
-{
-       auto ld = (ImageLoaderExternal *) loader;
-       return ld->pixbuf;
-}
-
-static gchar* image_loader_external_get_format_name(gpointer UNUSED(loader))
+gchar *ImageLoaderExternal::get_format_name()
 {
        return g_strdup("external");
 }
 
-static gchar** image_loader_external_get_format_mime_types(gpointer UNUSED(loader))
+gchar **ImageLoaderExternal::get_format_mime_types()
 {
-       static const gchar *mime[] = {"application/octet-stream", NULL};
+       static const gchar *mime[] = {"application/octet-stream", nullptr};
        return g_strdupv(const_cast<gchar **>(mime));
 }
 
-static gboolean image_loader_external_close(gpointer UNUSED(loader), GError **UNUSED(error))
-{
-       return TRUE;
-}
-
-static void image_loader_external_abort(gpointer loader)
+ImageLoaderExternal::~ImageLoaderExternal()
 {
-       auto ld = (ImageLoaderExternal *) loader;
-       ld->abort = TRUE;
+       if (pixbuf) g_object_unref(pixbuf);
 }
 
-static void image_loader_external_free(gpointer loader)
-{
-       auto ld = (ImageLoaderExternal *) loader;
-       if (ld->pixbuf) g_object_unref(ld->pixbuf);
-       g_free(ld);
-}
+} // namespace
 
-void image_loader_backend_set_external(ImageLoaderBackend *funcs)
+std::unique_ptr<ImageLoaderBackend> get_image_loader_backend_external()
 {
-       funcs->loader_new = image_loader_external_new;
-       funcs->set_size = image_loader_external_set_size;
-       funcs->load = image_loader_external_load;
-       funcs->write = NULL;
-       funcs->get_pixbuf = image_loader_external_get_pixbuf;
-       funcs->close = image_loader_external_close;
-       funcs->abort = image_loader_external_abort;
-       funcs->free = image_loader_external_free;
-       funcs->get_format_name = image_loader_external_get_format_name;
-       funcs->get_format_mime_types = image_loader_external_get_format_mime_types;
+       return std::make_unique<ImageLoaderExternal>();
 }
 
-
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */