diff options
| author | Tim Janik <timj@gtk.org> | 2001-06-26 08:32:25 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2001-06-26 08:32:25 +0000 |
| commit | bf0d61a59b9e1b889ba98b36b05a90e76f64eced (patch) | |
| tree | fe8a750554c398b744dbfd4b99eb617122344b00 /demos | |
| parent | 0e0ee24bea94062f9dc3d82007cc5184a7f79b3a (diff) | |
| download | gtk+-bf0d61a59b9e1b889ba98b36b05a90e76f64eced.tar.gz | |
use gdk_pixbuf_new_from_stream(). fixed up item factory so inlined pixbufs
Tue Jun 26 10:04:30 2001 Tim Janik <timj@gtk.org>
* gtk/gtkiconfactory.c:
* gtk/gtkitemfactory.c: use gdk_pixbuf_new_from_stream(). fixed up
item factory so inlined pixbufs actually work.
Tue Jun 26 09:48:02 2001 Tim Janik <timj@gtk.org>
* Makefile.am (noinst_PROGRAMS): get rid of make-inline-pixbuf
* gdk-pixbuf-data.[hc]: provide gdk_pixbuf_new_from_stream()
instead from gdk_pixbuf_new_from_inline().
* gdk-pixdata.[hc]: auxillary GdkPixdata structure, public
installed API for applications that need to serialize/deserialize
on their own (gimp, BEAST).
* gdk-pixbuf/gdk-pixbuf-csource.c: provide publically installed
program that can dump images in CSource format and Pixbuf
stream format. supports RLE encoding, MACRO formatting etc...
invoke with --help.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/Makefile.am | 8 | ||||
| -rw-r--r-- | demos/testpixbuf.c | 20 |
2 files changed, 19 insertions, 9 deletions
diff --git a/demos/Makefile.am b/demos/Makefile.am index 25eba72653..5bcf5023cb 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -32,10 +32,12 @@ noinst_PROGRAMS = \ BUILT_SOURCES=test-inline-pixbufs.h -test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/make-inline-pixbuf apple-red.png gnome-foot.png +test-inline-pixbufs.h: $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource apple-red.png gnome-foot.png (topdir=`cd $(top_builddir) && pwd` ; curdir=`pwd` ; \ - cd $(srcdir) && \ - GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs $$topdir/gdk-pixbuf/make-inline-pixbuf $$curdir/test-inline-pixbufs.h apple_red apple-red.png gnome_foot gnome-foot.png) + cd $(srcdir) && \ + GDK_PIXBUF_MODULEDIR=$$topdir/gdk-pixbuf/.libs \ + $$topdir/gdk-pixbuf/gdk-pixbuf-csource --build-list \ + apple_red apple-red.png gnome_foot gnome-foot.png >$$curdir/test-inline-pixbufs.h) testpixbuf_DEPENDENCIES = $(DEPS) testpixbuf_drawable_DEPENDENCIES = $(DEPS) diff --git a/demos/testpixbuf.c b/demos/testpixbuf.c index 0af6d368e9..a2ecbe1f08 100644 --- a/demos/testpixbuf.c +++ b/demos/testpixbuf.c @@ -543,7 +543,8 @@ main (int argc, char **argv) i = 1; if (argc == 1) { const gchar*** xpmp; - + GError *error = NULL; + pixbuf = gdk_pixbuf_new_from_data (default_image, GDK_COLORSPACE_RGB, FALSE, 8, DEFAULT_WIDTH, DEFAULT_HEIGHT, DEFAULT_WIDTH * 3, NULL, NULL); @@ -557,11 +558,18 @@ main (int argc, char **argv) } /* Test loading from inline data. */ - pixbuf = gdk_pixbuf_new_from_inline (apple_red, FALSE, -1, NULL); - new_testrgb_window (pixbuf, "Red apple from inline data"); - - pixbuf = gdk_pixbuf_new_from_inline (gnome_foot, TRUE, sizeof (gnome_foot), NULL); - new_testrgb_window (pixbuf, "Foot from inline data"); + pixbuf = gdk_pixbuf_new_from_stream (-1, apple_red, FALSE, &error); + if (!pixbuf) + { + fprintf (stderr, "failed to construct \"red apple\" pixbuf: %s\n", + error->message); + g_error_free (error); + } + else + new_testrgb_window (pixbuf, "Red apple from inlined RLE data"); + + pixbuf = gdk_pixbuf_new_from_stream (sizeof (gnome_foot), gnome_foot, TRUE, NULL); + new_testrgb_window (pixbuf, "GNOME Foot from inlined RLE data"); found_valid = TRUE; } else { |