diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | demos/Makefile.am | 8 | ||||
| -rw-r--r-- | demos/testpixbuf.c | 20 |
9 files changed, 61 insertions, 9 deletions
@@ -1,3 +1,9 @@ +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. + 2001-06-25 Havoc Pennington <hp@redhat.com> * gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 160bf460d0..07d8094789 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +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. + 2001-06-25 Havoc Pennington <hp@redhat.com> * gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 160bf460d0..07d8094789 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +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. + 2001-06-25 Havoc Pennington <hp@redhat.com> * gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 160bf460d0..07d8094789 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +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. + 2001-06-25 Havoc Pennington <hp@redhat.com> * gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 160bf460d0..07d8094789 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +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. + 2001-06-25 Havoc Pennington <hp@redhat.com> * gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 160bf460d0..07d8094789 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +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. + 2001-06-25 Havoc Pennington <hp@redhat.com> * gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 160bf460d0..07d8094789 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +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. + 2001-06-25 Havoc Pennington <hp@redhat.com> * gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c: 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 { |