aboutsummaryrefslogtreecommitdiffstats
path: root/packages/gtk+/gtk+-2.6.4-1.osso7/io-gif-animation.c.diff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-11-06 07:42:50 +0000
committerMichael Lauer <mickey@vanille-media.de>2006-11-06 07:42:50 +0000
commitd6ed5ee9f9682d7de5012fac6528f46675cfb43c (patch)
tree0804d8877d5dc17adb6be4ad617a531d10d47a3a /packages/gtk+/gtk+-2.6.4-1.osso7/io-gif-animation.c.diff
parenta9c8c4187d22b0420bb6e40bbd699cb5fa7af083 (diff)
downloadopenembedded-d6ed5ee9f9682d7de5012fac6528f46675cfb43c.tar.gz
gtk+: remove a couple of obsolete versions, major stable versions remain
gtk+-2.6.10: add menu styling patch based on gtk+ 2.7
Diffstat (limited to 'packages/gtk+/gtk+-2.6.4-1.osso7/io-gif-animation.c.diff')
-rw-r--r--packages/gtk+/gtk+-2.6.4-1.osso7/io-gif-animation.c.diff108
1 files changed, 0 insertions, 108 deletions
diff --git a/packages/gtk+/gtk+-2.6.4-1.osso7/io-gif-animation.c.diff b/packages/gtk+/gtk+-2.6.4-1.osso7/io-gif-animation.c.diff
deleted file mode 100644
index d030ae30b8..0000000000
--- a/packages/gtk+/gtk+-2.6.4-1.osso7/io-gif-animation.c.diff
+++ /dev/null
@@ -1,108 +0,0 @@
---- gtk+-2.6.4/gdk-pixbuf/io-gif-animation.c 2003-06-27 05:38:43.000000000 +0300
-+++ gtk+-2.6.4/gdk-pixbuf/io-gif-animation.c 2005-04-06 16:19:35.595127080 +0300
-@@ -391,6 +391,11 @@
-
- while (tmp != NULL) {
- GdkPixbufFrame *f = tmp->data;
-+
-+ if (f->pixbuf == NULL) {
-+ return;
-+ }
-+
- gint clipped_width = MIN (gif_anim->width - f->x_offset, gdk_pixbuf_get_width (f->pixbuf));
- gint clipped_height = MIN (gif_anim->height - f->y_offset, gdk_pixbuf_get_height (f->pixbuf));
-
-@@ -414,6 +419,10 @@
- TRUE,
- 8, gif_anim->width, gif_anim->height);
-
-+ if (f->composited == NULL) {
-+ return;
-+ }
-+
- /* alpha gets dumped if f->composited has no alpha */
-
- gdk_pixbuf_fill (f->composited,
-@@ -453,9 +462,18 @@
-
- if (prev_frame->action == GDK_PIXBUF_FRAME_RETAIN) {
- f->composited = gdk_pixbuf_copy (prev_frame->composited);
-+
-+ if (f->composited == NULL) {
-+ return;
-+ }
-
- } else if (prev_frame->action == GDK_PIXBUF_FRAME_DISPOSE) {
- f->composited = gdk_pixbuf_copy (prev_frame->composited);
-+
-+ if (f->composited == NULL) {
-+ return;
-+ }
-+
- if (prev_clipped_width > 0 && prev_clipped_height > 0) {
- /* Clear area of previous frame to background */
- GdkPixbuf *area;
-@@ -465,6 +483,10 @@
- prev_frame->y_offset,
- prev_clipped_width,
- prev_clipped_height);
-+
-+ if (area == NULL) {
-+ return;
-+ }
-
- gdk_pixbuf_fill (area,
- (gif_anim->bg_red << 24) |
-@@ -475,7 +497,13 @@
- }
- } else if (prev_frame->action == GDK_PIXBUF_FRAME_REVERT) {
- f->composited = gdk_pixbuf_copy (prev_frame->composited);
-- if (prev_clipped_width > 0 && prev_clipped_height > 0) {
-+
-+ if (f->composited == NULL) {
-+ return;
-+ }
-+
-+ if (prev_frame->revert != NULL &&
-+ prev_clipped_width > 0 && prev_clipped_height > 0) {
- /* Copy in the revert frame */
- gdk_pixbuf_copy_area (prev_frame->revert,
- 0, 0,
-@@ -500,14 +528,23 @@
- f->y_offset,
- clipped_width,
- clipped_height);
--
-+
-+ if (area == NULL) {
-+ return;
-+ }
-+
- f->revert = gdk_pixbuf_copy (area);
--
-+
- g_object_unref (area);
-+
-+ if (f->revert == NULL) {
-+ return;
-+ }
- }
- }
-
-- if (clipped_width > 0 && clipped_height > 0) {
-+ if (clipped_width > 0 && clipped_height > 0 &&
-+ f->pixbuf != NULL && f->composited != NULL) {
- /* Put current frame onto f->composited */
- gdk_pixbuf_composite (f->pixbuf,
- f->composited,
-@@ -531,10 +568,6 @@
- tmp = tmp->next;
- }
- }
--
-- g_assert (frame->composited != NULL);
-- g_assert (gdk_pixbuf_get_width (frame->composited) == gif_anim->width);
-- g_assert (gdk_pixbuf_get_height (frame->composited) == gif_anim->height);
- }
-
- GdkPixbuf*