* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "main.h"
+#include <config.h>
-#include "image-load.h"
+#if HAVE_WEBP
#include "image-load-webp.h"
-#ifdef HAVE_WEBP
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <glib-object.h>
+#include <glib.h>
#include <webp/decode.h>
-typedef struct _ImageLoaderWEBP ImageLoaderWEBP;
-struct _ImageLoaderWEBP {
- ImageLoaderBackendCbAreaUpdated area_updated_cb;
- ImageLoaderBackendCbSize size_cb;
- ImageLoaderBackendCbAreaPrepared area_prepared_cb;
+#include "debug.h"
+#include "image-load.h"
+
+namespace
+{
+
+struct ImageLoaderWEBP : public ImageLoaderBackend
+{
+public:
+ ~ImageLoaderWEBP() 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 void free_buffer(guchar *pixels, gpointer)
+void free_buffer(guchar *pixels, gpointer)
{
g_free(pixels);
}
-static gboolean image_loader_webp_load(gpointer loader, const guchar *buf, gsize count, GError **)
+gboolean ImageLoaderWEBP::write(const guchar *buf, gsize &chunk_size, gsize count, GError **)
{
- ImageLoaderWEBP *ld = (ImageLoaderWEBP *) loader;
- guint8* data;
- gint width, height;
+ guint8* pixels;
+ gint width;
+ gint height;
gboolean res_info;
WebPBitstreamFeatures features;
VP8StatusCode status_code;
if (features.has_alpha)
{
- data = WebPDecodeRGBA(buf, count, &width, &height);
+ pixels = WebPDecodeRGBA(buf, count, &width, &height);
}
else
{
- data = WebPDecodeRGB(buf, count, &width, &height);
+ pixels = WebPDecodeRGB(buf, count, &width, &height);
}
- ld->pixbuf = gdk_pixbuf_new_from_data(data, GDK_COLORSPACE_RGB, features.has_alpha, 8, width, height, width * (features.has_alpha ? 4 : 3), free_buffer, NULL);
+ pixbuf = gdk_pixbuf_new_from_data(pixels, GDK_COLORSPACE_RGB, features.has_alpha, 8, width, height, width * (features.has_alpha ? 4 : 3), free_buffer, nullptr);
- ld->area_updated_cb(loader, 0, 0, width, height, ld->data);
+ area_updated_cb(nullptr, 0, 0, width, height, data);
+ chunk_size = count;
return TRUE;
}
-static gpointer image_loader_webp_new(ImageLoaderBackendCbAreaUpdated area_updated_cb, ImageLoaderBackendCbSize size_cb, ImageLoaderBackendCbAreaPrepared area_prepared_cb, gpointer data)
+void ImageLoaderWEBP::init(AreaUpdatedCb area_updated_cb, SizePreparedCb, AreaPreparedCb, gpointer data)
{
- ImageLoaderWEBP *loader = g_new0(ImageLoaderWEBP, 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_webp_set_size(gpointer loader, int width, int height)
+GdkPixbuf *ImageLoaderWEBP::get_pixbuf()
{
- ImageLoaderWEBP *ld = (ImageLoaderWEBP *) loader;
- ld->requested_width = width;
- ld->requested_height = height;
+ return pixbuf;
}
-static GdkPixbuf* image_loader_webp_get_pixbuf(gpointer loader)
-{
- ImageLoaderWEBP *ld = (ImageLoaderWEBP *) loader;
- return ld->pixbuf;
-}
-
-static gchar* image_loader_webp_get_format_name(gpointer)
+gchar *ImageLoaderWEBP::get_format_name()
{
return g_strdup("webp");
}
-static gchar** image_loader_webp_get_format_mime_types(gpointer)
+gchar **ImageLoaderWEBP::get_format_mime_types()
{
static const gchar *mime[] = {"image/webp", nullptr};
return g_strdupv(const_cast<gchar **>(mime));
}
-static gboolean image_loader_webp_close(gpointer, GError **)
+ImageLoaderWEBP::~ImageLoaderWEBP()
{
- return TRUE;
+ if (pixbuf) g_object_unref(pixbuf);
}
-static void image_loader_webp_abort(gpointer loader)
-{
- ImageLoaderWEBP *ld = (ImageLoaderWEBP *) loader;
- ld->abort = TRUE;
-}
+} // namespace
-static void image_loader_webp_free(gpointer loader)
-{
- ImageLoaderWEBP *ld = (ImageLoaderWEBP *) loader;
- if (ld->pixbuf) g_object_unref(ld->pixbuf);
- g_free(ld);
-}
-void image_loader_backend_set_webp(ImageLoaderBackend *funcs)
+std::unique_ptr<ImageLoaderBackend> get_image_loader_backend_webp()
{
-DEBUG_0(" " );
- funcs->loader_new = image_loader_webp_new;
- funcs->set_size = image_loader_webp_set_size;
- funcs->load = image_loader_webp_load;
- funcs->write = NULL;
- funcs->get_pixbuf = image_loader_webp_get_pixbuf;
- funcs->close = image_loader_webp_close;
- funcs->abort = image_loader_webp_abort;
- funcs->free = image_loader_webp_free;
- funcs->get_format_name = image_loader_webp_get_format_name;
- funcs->get_format_mime_types = image_loader_webp_get_format_mime_types;
+ DEBUG_0(" " );
+ return std::make_unique<ImageLoaderWEBP>();
}
#endif