summaryrefslogtreecommitdiff
path: root/demos
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>1999-10-27 18:55:00 +0000
committerHavoc Pennington <hp@src.gnome.org>1999-10-27 18:55:00 +0000
commit54f017171fefee078ad36a4d2a6c67622c8f57de (patch)
tree0bb7951e213bc386a7bb7cff841c729e402eba84 /demos
parent2ec115ea801002eb68b7881433a17c5810605a80 (diff)
downloadgtk+-54f017171fefee078ad36a4d2a6c67622c8f57de.tar.gz
Check properly whether the XPM module has already been loaded
1999-10-27 Havoc Pennington <hp@pobox.com> * src/gdk-pixbuf-io.c (gdk_pixbuf_new_from_xpm_data): Check properly whether the XPM module has already been loaded (gdk_pixbuf_new_from_file): Check properly if loader module was already loaded (was checking if load symbol was present in order to decide whether to re-load; should check module != NULL, then load != NULL) (image_handler_load): Check in present working directory, makes it easier to debug for now (file_formats): This array initializer was seriously on crack, was assigning a function pointer to a GModule* * src/testpixbuf.c (main): Change type of pixbuf_loader to GdkPixbufLoader* * src/io-png.c: Progressive loading stuff compiles, untested.
Diffstat (limited to 'demos')
-rw-r--r--demos/testpixbuf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c
index 20dc5f79a6..fc6d0aa397 100644
--- a/demos/testpixbuf.c
+++ b/demos/testpixbuf.c
@@ -409,7 +409,7 @@ main (int argc, char **argv)
int found_valid = FALSE;
GdkPixbuf *pixbuf;
- GtkObject *pixbuf_loader;
+ GdkPixbufLoader *pixbuf_loader;
FILE *file;
gint val;
guchar buf;