summaryrefslogtreecommitdiff
path: root/gdk/gdkpixbuf-drawable.c
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@helixcode.com>2000-01-02 03:59:22 +0000
committerArturo Espinosa <unammx@src.gnome.org>2000-01-02 03:59:22 +0000
commit6e3522ab2c44c90da28d1064a2f56c3a7184f749 (patch)
treed240b6f7fd3baf8229fb1d9202b09fccb43786e2 /gdk/gdkpixbuf-drawable.c
parent605c562ffb42dd00f5d67bca8776953ea6dde78d (diff)
downloadgdk-pixbuf-6e3522ab2c44c90da28d1064a2f56c3a7184f749.tar.gz
Added reference counting to animations. A web browser may want to share a
2000-01-01 Federico Mena Quintero <federico@helixcode.com> * gdk-pixbuf/gdk-pixbuf.h (GdkPixbufAnimation): Added reference counting to animations. A web browser may want to share a single copy of an animated GIF if it appears multiple times in a web page, for example. * gdk-pixbuf/gdk-pixbuf-animation.c: New file. Moved the animation functions here. (gdk_pixbuf_animation_new_from_file): Prettified. Return a NULL animation if the loader does not support multiframe loading and the single-frame load returned NULL. Check that the filename is not NULL. Updated inline documentation. (gdk_pixbuf_animation_ref): New function. (gdk_pixbuf_animation_unref): New function. Removed gdk_pixbuf_animation_destroy() in favor of reference counting. * gdk-pixbuf/gdk-pixbuf-io.c (gdk_pixbuf_new_from_file): Prettified. Made ref_count assertion more paranoid. Check that the filename is not NULL. (gdk_pixbuf_get_module): Use guchar * and guint for buffer and size, respectively. (gdk_pixbuf_new_from_xpm_data): Changed the "data" argument to const char **. * gdk-pixbuf/io-gif.c (image_load_animation): Create the animation with a reference count of 1. * gdk-pixbuf/Makefile.am (libgdk_pixbuf_la_SOURCES): Added gdk-pixbuf-animation.c. * doc/tmpl/animation.sgml: Populated. It is still missing a description of the overlay modes. * doc/gdk-pixbuf-sections.txt: Added the animation section. Moved the canvas item section to the end, as it will be moved later to gnome-libs. * doc/gdk-pixbuf.sgml: Added the animation section. * doc/Makefile.am (tmpl_sources): Added tmpl/animation.sgml.
Diffstat (limited to 'gdk/gdkpixbuf-drawable.c')
-rw-r--r--gdk/gdkpixbuf-drawable.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index e645130f7..a6adbc95a 100644
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -5,7 +5,7 @@
*
* Authors: Michael Zucchi <zucchi@zedzone.mmc.com.au>
* Cody Russell <bratsche@dfw.net>
- * Federico
+ * Federico Mena-Quintero <federico@gimp.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -952,7 +952,7 @@ rgbconvert (GdkImage *image, art_u8 *pixels, int rowstride, int alpha, GdkColorm
if (v->red_mask == 0xf800 && v->green_mask == 0x7e0 && v->blue_mask == 0x1f
&& image->bpp == 16)
bank = 3;
- break;
+ break;
case 24:
case 32:
if (v->red_mask == 0xff0000 && v->green_mask == 0xff00 && v->blue_mask == 0xff
@@ -1030,7 +1030,7 @@ gdk_pixbuf_get_from_drawable (GdkPixbuf *dest,
int width, int height)
{
GdkWindowType window_type;
- gint src_width, src_height;
+ int src_width, src_height;
ArtPixBuf *apb = NULL;
GdkImage *image;
int rowstride, bpp, alpha;
@@ -1076,7 +1076,7 @@ gdk_pixbuf_get_from_drawable (GdkPixbuf *dest,
if (window_type != GDK_WINDOW_PIXMAP) {
int ret;
- gint src_xorigin, src_yorigin;
+ int src_xorigin, src_yorigin;
int screen_width, screen_height;
int screen_srcx, screen_srcy;