Support for separately installed loaders. (#77486)

	* Makefile.am gdk-pixbuf-animation.c gdk-pixbuf-data.c
	gdk-pixbuf-io.c gdk-pixbuf-io.h gdk-pixbuf-loader.c
	gdk-pixbuf-loader.h gdk-pixbuf-private.h gdk-pixbuf.h
	gdk-pixdata.c io-ani-animation.h io-ani.c io-bmp.c
	io-gif-animation.c io-gif-animation.h io-gif.c io-ico.c
	io-jpeg.c io-png.c io-pnm.c io-ras.c io-tga.c io-tiff.c
	io-wbmp.c io-xbm.c io-xpm.c pixbufloader_ani.def
	pixbufloader_bmp.def pixbufloader_gif.def pixbufloader_ico.def
	pixbufloader_jpeg.def pixbufloader_png.def
	pixbufloader_pnm.def pixbufloader_ras.def pixbufloader_tga.def
	pixbufloader_tiff.def pixbufloader_wbmp.def
	pixbufloader_xbm.def pixbufloader_xpm.def test-gdk-pixbuf.c
	gdk-pixbuf-animation.h queryloaders.c: Support for separately
	installed loaders.  (#77486)

1 files changed, 22 insertions, 59 deletions

diff --git a/gdk-pixbuf/gdk-pixbuf-private.h b/gdk-pixbuf/gdk-pixbuf-private.h
index db13af8058..e81478f991 100644
--- a/gdk-pixbuf/gdk-pixbuf-private.h
+++ b/gdk-pixbuf/gdk-pixbuf-private.h
@@ -28,6 +28,9 @@
 #define GDK_PIXBUF_PRIVATE_H
 
 #include "gdk-pixbuf.h"
+#include "gdk-pixbuf-io.h"
+#include "gdk-pixbuf-i18n.h"
+#include <stdio.h>
 
 
 
@@ -74,70 +77,30 @@ struct _GdkPixbufClass {
 
 };
 
-typedef struct _GdkPixbufAnimationClass GdkPixbufAnimationClass;
+#ifdef GDK_PIXBUF_ENABLE_BACKEND
 
-#define GDK_PIXBUF_ANIMATION_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_ANIMATION, GdkPixbufAnimationClass))
-#define GDK_IS_PIXBUF_ANIMATION_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_ANIMATION))
-#define GDK_PIXBUF_ANIMATION_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXBUF_ANIMATION, GdkPixbufAnimationClass))
+GdkPixbufModule *_gdk_pixbuf_get_module (guchar *buffer, guint size,
+                                         const gchar *filename,
+                                         GError **error);
+GdkPixbufModule *_gdk_pixbuf_get_named_module (const char *name,
+                                               GError **error);
+gboolean _gdk_pixbuf_load_module (GdkPixbufModule *image_module,
+                                  GError **error);
 
-/* Private part of the GdkPixbufAnimation structure */
-struct _GdkPixbufAnimation {
-        GObject parent_instance;
-
-};
-
-struct _GdkPixbufAnimationClass {
-        GObjectClass parent_class;
-
-        gboolean                (*is_static_image)  (GdkPixbufAnimation *anim);
-
-        GdkPixbuf*              (*get_static_image) (GdkPixbufAnimation *anim);
-        
-        void                    (*get_size) (GdkPixbufAnimation *anim,
-                                             int                 *width,
-                                             int                 *height);
-        
-        GdkPixbufAnimationIter* (*get_iter) (GdkPixbufAnimation *anim,
-                                             const GTimeVal     *start_time);
+GdkPixbuf *_gdk_pixbuf_generic_image_load (GdkPixbufModule *image_module,
+					   FILE *f,
+					   GError **error);
 
-};
-
-
-
-typedef struct _GdkPixbufAnimationIterClass GdkPixbufAnimationIterClass;
-
-#define GDK_PIXBUF_ANIMATION_ITER_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_PIXBUF_ANIMATION_ITER, GdkPixbufAnimationIterClass))
-#define GDK_IS_PIXBUF_ANIMATION_ITER_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_PIXBUF_ANIMATION_ITER))
-#define GDK_PIXBUF_ANIMATION_ITER_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_PIXBUF_ANIMATION_ITER, GdkPixbufAnimationIterClass))
-
-struct _GdkPixbufAnimationIter {
-        GObject parent_instance;
+GdkPixbufFormat *_gdk_pixbuf_get_format (GdkPixbufModule *image_module);
 
-};
-
-struct _GdkPixbufAnimationIterClass {
-        GObjectClass parent_class;
-
-        int        (*get_delay_time)   (GdkPixbufAnimationIter *iter);
-
-        GdkPixbuf* (*get_pixbuf)       (GdkPixbufAnimationIter *iter);
-
-        gboolean (*on_currently_loading_frame) (GdkPixbufAnimationIter *iter);
-
-        gboolean (*advance)            (GdkPixbufAnimationIter *iter,
-                                        const GTimeVal         *current_time);
-};
-      
-
-GdkPixbufAnimation* gdk_pixbuf_non_anim_new (GdkPixbuf *pixbuf);
-
-
+#ifdef USE_GMODULE
+#define MODULE_ENTRY(type,function) function
+#else
+#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function
+#endif
 
-/*  key/value pairs that can be attached by the pixbuf loader  */
+#endif /* GDK_PIXBUF_ENABLE_BACKEND */
 
-gboolean gdk_pixbuf_set_option  (GdkPixbuf   *pixbuf,
-                                 const gchar *key,
-                                 const gchar *value);
+#endif /* GDK_PIXBUF_PRIVATE_H */
 
 
-#endif