diff options
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 6 | ||||
| -rw-r--r-- | gdk-pixbuf/Makefile.am | 1 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-features.h.in | 12 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf.c | 17 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf.h | 6 |
5 files changed, 41 insertions, 1 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 4d23b7030f..2d30078e79 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,9 @@ +2000-01-10 Elliot Lee <sopwith@redhat.com> + + * configure.in: Define version macros. Generate gdk-pixbuf/gdk-pixbuf-features.h. Always INSIDE_GNOME. + * gdk-pixbuf/Makefile.am: Add gdk-pixbuf-features.h + * gdk-pixbuf/gdk-pixbuf.c: Add definitions of gdk-pixbuf-features.h declarations, plus some initialization stubs. + 2000-01-05 Owen Taylor <otaylor@redhat.com> * gdk-pixbuf/pixops/pixops.c: Fixed src_channels/dest_channels diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index bf8caded64..4841efb4e4 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -104,6 +104,7 @@ libgdk_pixbuf_la_LIBADD = pixops/libpixops.la libgdk_pixbufinclude_HEADERS = \ gdk-pixbuf.h \ gdk-pixbuf-loader.h \ + gdk-pixbuf-features.h \ $(CANVAS_HEADERFILES) noinst_HEADERS = \ diff --git a/gdk-pixbuf/gdk-pixbuf-features.h.in b/gdk-pixbuf/gdk-pixbuf-features.h.in new file mode 100644 index 0000000000..0681f49610 --- /dev/null +++ b/gdk-pixbuf/gdk-pixbuf-features.h.in @@ -0,0 +1,12 @@ +#ifndef GDK_PIXBUF_FEATURES_H +#define GDK_PIXBUF_FEATURES_H 1 + +#define GDK_PIXBUF_MAJOR (@GDK_PIXBUF_MAJOR@) +#define GDK_PIXBUF_MINOR (@GDK_PIXBUF_MINOR@) +#define GDK_PIXBUF_MICRO (@GDK_PIXBUF_MICRO@) +#define GDK_PIXBUF_VERSION "@GDK_PIXBUF_VERSION@" + +extern const guint gdk_pixbuf_major_version, gdk_pixbuf_minor_version, gdk_pixbuf_micro_version; +extern const char *gdk_pixbuf_version; + +#endif diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c index 329de797c2..fab12f2e3f 100644 --- a/gdk-pixbuf/gdk-pixbuf.c +++ b/gdk-pixbuf/gdk-pixbuf.c @@ -291,3 +291,20 @@ gdk_pixbuf_get_rowstride (GdkPixbuf *pixbuf) return pixbuf->art_pixbuf->rowstride; } + +/* General initialization hooks */ +const guint gdk_pixbuf_major_version=GDK_PIXBUF_MAJOR, + gdk_pixbuf_minor_version=GDK_PIXBUF_MINOR, + gdk_pixbuf_micro_version=GDK_PIXBUF_MICRO; + +const char *gdk_pixbuf_version = GDK_PIXBUF_VERSION; + +void +gdk_pixbuf_preinit(gpointer app, gpointer modinfo) +{ +} + +void +gdk_pixbuf_postinit(gpointer app, gpointer modinfo) +{ +} diff --git a/gdk-pixbuf/gdk-pixbuf.h b/gdk-pixbuf/gdk-pixbuf.h index 28e7f4da64..82784c3023 100644 --- a/gdk-pixbuf/gdk-pixbuf.h +++ b/gdk-pixbuf/gdk-pixbuf.h @@ -34,7 +34,7 @@ extern "C" { #endif - +#include <gdk-pixbuf/gdk-pixbuf-features.h> /* GdkPixbuf structures */ typedef struct _GdkPixbuf GdkPixbuf; @@ -226,6 +226,10 @@ GdkPixbufAnimation *gdk_pixbuf_animation_new_from_file (const char *filename); void gdk_pixbuf_animation_ref (GdkPixbufAnimation *animation); void gdk_pixbuf_animation_unref (GdkPixbufAnimation *animation); +/* General (presently empty) initialization hooks, primarily for gnome-libs */ +void gdk_pixbuf_preinit(gpointer app, gpointer modinfo); +void gdk_pixbuf_postinit(gpointer app, gpointer modinfo); + #ifdef __cplusplus |