Let image loader backend decide how to process image buffer

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

diff --git a/src/image-load-djvu.cc b/src/image-load-djvu.cc
index b15391e..36c9b43 100644 (file)
--- a/src/image-load-djvu.cc
+++ b/src/image-load-djvu.cc
@@ -32,6 +32,9 @@
 
 #include "image-load.h"
 
+namespace
+{
+
 struct ImageLoaderDJVU {
        ImageLoaderBackendCbAreaUpdated area_updated_cb;
        ImageLoaderBackendCbSize size_cb;
@@ -45,12 +48,12 @@ struct ImageLoaderDJVU {
        gint page_total;
 };
 
-static void free_buffer(guchar *pixels, gpointer)
+void free_buffer(guchar *pixels, gpointer)
 {
-       g_free (pixels);;
+       g_free (pixels);
 }
 
-static gboolean image_loader_djvu_load(gpointer loader, const guchar *buf, gsize count, GError **)
+gboolean image_loader_djvu_write(gpointer loader, const guchar *buf, gsize &chunk_size, gsize count, GError **)
 {
        auto ld = static_cast<ImageLoaderDJVU *>(loader);
        ddjvu_context_t *ctx;
@@ -114,10 +117,11 @@ static gboolean image_loader_djvu_load(gpointer loader, const guchar *buf, gsize
        ddjvu_document_release(doc);
        ddjvu_context_release(ctx);
 
+       chunk_size = count;
        return TRUE;
 }
 
-static gpointer image_loader_djvu_new(ImageLoaderBackendCbAreaUpdated area_updated_cb, ImageLoaderBackendCbSize size_cb, ImageLoaderBackendCbAreaPrepared area_prepared_cb, gpointer data)
+gpointer image_loader_djvu_new(ImageLoaderBackendCbAreaUpdated area_updated_cb, ImageLoaderBackendCbSize size_cb, ImageLoaderBackendCbAreaPrepared area_prepared_cb, gpointer data)
 {
        auto loader = g_new0(ImageLoaderDJVU, 1);
        loader->area_updated_cb = area_updated_cb;
@@ -127,68 +131,69 @@ static gpointer image_loader_djvu_new(ImageLoaderBackendCbAreaUpdated area_updat
        return loader;
 }
 
-static void image_loader_djvu_set_size(gpointer loader, int width, int height)
+void image_loader_djvu_set_size(gpointer loader, int width, int height)
 {
        auto ld = static_cast<ImageLoaderDJVU *>(loader);
        ld->requested_width = width;
        ld->requested_height = height;
 }
 
-static GdkPixbuf* image_loader_djvu_get_pixbuf(gpointer loader)
+GdkPixbuf* image_loader_djvu_get_pixbuf(gpointer loader)
 {
        auto ld = static_cast<ImageLoaderDJVU *>(loader);
        return ld->pixbuf;
 }
 
-static gchar* image_loader_djvu_get_format_name(gpointer)
+gchar* image_loader_djvu_get_format_name(gpointer)
 {
        return g_strdup("djvu");
 }
 
-static gchar** image_loader_djvu_get_format_mime_types(gpointer)
+gchar** image_loader_djvu_get_format_mime_types(gpointer)
 {
        static const gchar *mime[] = {"image/vnd.djvu", nullptr};
        return g_strdupv(const_cast<gchar **>(mime));
 }
 
-static void image_loader_djvu_set_page_num(gpointer loader, gint page_num)
+void image_loader_djvu_set_page_num(gpointer loader, gint page_num)
 {
        auto ld = static_cast<ImageLoaderDJVU *>(loader);
 
        ld->page_num = page_num;
 }
 
-static gint image_loader_djvu_get_page_total(gpointer loader)
+gint image_loader_djvu_get_page_total(gpointer loader)
 {
        auto ld = static_cast<ImageLoaderDJVU *>(loader);
 
        return ld->page_total;
 }
 
-static gboolean image_loader_djvu_close(gpointer, GError **)
+gboolean image_loader_djvu_close(gpointer, GError **)
 {
        return TRUE;
 }
 
-static void image_loader_djvu_abort(gpointer loader)
+void image_loader_djvu_abort(gpointer loader)
 {
        auto ld = static_cast<ImageLoaderDJVU *>(loader);
        ld->abort = TRUE;
 }
 
-static void image_loader_djvu_free(gpointer loader)
+void image_loader_djvu_free(gpointer loader)
 {
        auto ld = static_cast<ImageLoaderDJVU *>(loader);
        if (ld->pixbuf) g_object_unref(ld->pixbuf);
        g_free(ld);
 }
 
+} // namespace
+
 void image_loader_backend_set_djvu(ImageLoaderBackend *funcs)
 {
        funcs->loader_new = image_loader_djvu_new;
        funcs->set_size = image_loader_djvu_set_size;
-       funcs->load = image_loader_djvu_load;
-       funcs->write = nullptr;
+       funcs->write = image_loader_djvu_write;
        funcs->get_pixbuf = image_loader_djvu_get_pixbuf;
        funcs->close = image_loader_djvu_close;
        funcs->abort = image_loader_djvu_abort;