diff options
author | Richard Purdie <richard@openedhand.com> | 2005-09-02 11:50:01 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2005-09-02 11:50:01 +0000 |
commit | 95efeafc86f47592b37c44f2f7314324cc04250d (patch) | |
tree | e60fe38e88d8e6cf42cf1311c5ada752b79a59c7 /openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/io-gif.c.diff | |
parent | 7755d9d194b42ea859096f805f2e22ae5b6e6281 (diff) | |
download | openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.gz openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.bz2 openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.tar.xz openembedded-core-95efeafc86f47592b37c44f2f7314324cc04250d.zip |
Add gtk+, avahi, dbus-0.34 (.36 coming soon) and dependencies. Fix x11-common breakage.
git-svn-id: https://svn.o-hand.com/repos/poky@13 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/io-gif.c.diff')
-rw-r--r-- | openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/io-gif.c.diff | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/io-gif.c.diff b/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/io-gif.c.diff new file mode 100644 index 000000000..a42d0e4ac --- /dev/null +++ b/openembedded/packages/gtk+/gtk+-2.6.4-1.osso7/io-gif.c.diff @@ -0,0 +1,37 @@ +--- gtk+-2.6.4/gdk-pixbuf/io-gif.c 2004-11-12 07:34:31.000000000 +0200 ++++ gtk+-2.6.4/gdk-pixbuf/io-gif.c 2005-04-06 16:19:35.597126776 +0300 +@@ -920,6 +920,34 @@ + + gdk_pixbuf_gif_anim_frame_composite (context->animation, prev_frame); + ++ /* Composite failed */ ++ if (prev_frame->composited == NULL) { ++ GdkPixbufFrame *frame = NULL; ++ link = g_list_first (context->animation->frames); ++ while (link != NULL) { ++ frame = (GdkPixbufFrame *)link->data; ++ if (frame != NULL) { ++ if (frame->pixbuf != NULL) ++ g_object_unref (frame->pixbuf); ++ if (frame->composited != NULL) ++ g_object_unref (frame->composited); ++ if (frame->revert != NULL) ++ g_object_unref (frame->revert); ++ g_free (frame); ++ } ++ link = link->next; ++ } ++ ++ g_list_free (context->animation->frames); ++ context->animation->frames = NULL; ++ ++ g_set_error (context->error, ++ GDK_PIXBUF_ERROR, ++ GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY, ++ _("Not enough memory to composite a frame in GIF file")); ++ return -2; ++ } ++ + x = context->frame->x_offset; + y = context->frame->y_offset; + w = gdk_pixbuf_get_width (context->frame->pixbuf); |