Let image loader backend decide how to process image buffer

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

diff --git a/src/image-load-zxscr.cc b/src/image-load-zxscr.cc
index c3651e6..96b707a 100644 (file)
--- a/src/image-load-zxscr.cc
+++ b/src/image-load-zxscr.cc
@@ -27,6 +27,9 @@
 #include "debug.h"
 #include "image-load.h"
 
+namespace
+{
+
 struct ImageLoaderZXSCR {
        ImageLoaderBackendCbAreaUpdated area_updated_cb;
        ImageLoaderBackendCbSize size_cb;
@@ -38,7 +41,7 @@ struct ImageLoaderZXSCR {
        gboolean abort;
 };
 
-const guchar palette[2][8][3] = {
+constexpr guchar palette[2][8][3] = {
        {
                {0x00, 0x00, 0x00},
                {0x00, 0x00, 0xbf},
@@ -60,12 +63,12 @@ const guchar palette[2][8][3] = {
        }
 };
 
-static void free_buffer(guchar *pixels, gpointer)
+void free_buffer(guchar *pixels, gpointer)
 {
        g_free(pixels);
 }
 
-static gboolean image_loader_zxscr_load(gpointer loader, const guchar *buf, gsize count, GError **)
+gboolean image_loader_zxscr_write(gpointer loader, const guchar *buf, gsize &chunk_size, gsize count, GError **)
 {
        auto ld = static_cast<ImageLoaderZXSCR *>(loader);
        guint8 *pixels;
@@ -152,10 +155,11 @@ static gboolean image_loader_zxscr_load(gpointer loader, const guchar *buf, gsiz
 
        ld->area_updated_cb(loader, 0, 0, width, height, ld->data);
 
+       chunk_size = count;
        return TRUE;
 }
 
-static gpointer image_loader_zxscr_new(ImageLoaderBackendCbAreaUpdated area_updated_cb, ImageLoaderBackendCbSize size_cb, ImageLoaderBackendCbAreaPrepared area_prepared_cb, gpointer data)
+gpointer image_loader_zxscr_new(ImageLoaderBackendCbAreaUpdated area_updated_cb, ImageLoaderBackendCbSize size_cb, ImageLoaderBackendCbAreaPrepared area_prepared_cb, gpointer data)
 {
        auto loader = g_new0(ImageLoaderZXSCR, 1);
        loader->area_updated_cb = area_updated_cb;
@@ -165,54 +169,55 @@ static gpointer image_loader_zxscr_new(ImageLoaderBackendCbAreaUpdated area_upda
        return loader;
 }
 
-static void image_loader_zxscr_set_size(gpointer loader, int width, int height)
+void image_loader_zxscr_set_size(gpointer loader, int width, int height)
 {
        auto ld = static_cast<ImageLoaderZXSCR *>(loader);
        ld->requested_width = width;
        ld->requested_height = height;
 }
 
-static GdkPixbuf *image_loader_zxscr_get_pixbuf(gpointer loader)
+GdkPixbuf *image_loader_zxscr_get_pixbuf(gpointer loader)
 {
        auto ld = static_cast<ImageLoaderZXSCR *>(loader);
        return ld->pixbuf;
 }
 
-static gchar *image_loader_zxscr_get_format_name(gpointer)
+gchar *image_loader_zxscr_get_format_name(gpointer)
 {
        return g_strdup("zxscr");
 }
 
-static gchar **image_loader_zxscr_get_format_mime_types(gpointer)
+gchar **image_loader_zxscr_get_format_mime_types(gpointer)
 {
        static const gchar *mime[] = {"application/octet-stream", nullptr};
        return g_strdupv(const_cast<gchar **>(mime));
 }
 
-static gboolean image_loader_zxscr_close(gpointer, GError **)
+gboolean image_loader_zxscr_close(gpointer, GError **)
 {
        return TRUE;
 }
 
-static void image_loader_zxscr_abort(gpointer loader)
+void image_loader_zxscr_abort(gpointer loader)
 {
        auto ld = static_cast<ImageLoaderZXSCR *>(loader);
        ld->abort = TRUE;
 }
 
-static void image_loader_zxscr_free(gpointer loader)
+void image_loader_zxscr_free(gpointer loader)
 {
        auto ld = static_cast<ImageLoaderZXSCR *>(loader);
        if (ld->pixbuf) g_object_unref(ld->pixbuf);
        g_free(ld);
 }
 
+} // namespace
+
 void image_loader_backend_set_zxscr(ImageLoaderBackend *funcs)
 {
        funcs->loader_new = image_loader_zxscr_new;
        funcs->set_size = image_loader_zxscr_set_size;
-       funcs->load = image_loader_zxscr_load;
-       funcs->write = nullptr;
+       funcs->write = image_loader_zxscr_write;
        funcs->get_pixbuf = image_loader_zxscr_get_pixbuf;
        funcs->close = image_loader_zxscr_close;
        funcs->abort = image_loader_zxscr_abort;