diff options
author | Matthias Clasen <matthiasc@src.gnome.org> | 2004-06-19 05:45:55 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-06-19 05:45:55 +0000 |
commit | 6c217649976d0dd416466b1fe5a9c251779922c7 (patch) | |
tree | abc27fb3b0a3f9a2b38bc754dc9e4b4fd46f4fbb /gdk-pixbuf | |
parent | 92bed8d6d77f20286426dcfdf24bc400f3b832e1 (diff) | |
download | gtk+-6c217649976d0dd416466b1fe5a9c251779922c7.tar.gz |
Add a nice figure to the docs.
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r-- | gdk-pixbuf/ChangeLog | 5 | ||||
-rw-r--r-- | gdk-pixbuf/gdk-pixbuf-scale.c | 17 |
2 files changed, 19 insertions, 3 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index a0cddd1add..d8b1092974 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +Sat Jun 19 01:44:12 2004 Matthias Clasen <maclas@gmx.de> + + * gdk-pixbuf-scale.c (gdk_pixbuf_composite): Add a figure which + explains pixbuf compositing. + 2004-06-16 Matthias Clasen <mclasen@redhat.com> * io-tiff.c: Make the tiff loader work with both diff --git a/gdk-pixbuf/gdk-pixbuf-scale.c b/gdk-pixbuf/gdk-pixbuf-scale.c index 33a0199178..cc89946255 100644 --- a/gdk-pixbuf/gdk-pixbuf-scale.c +++ b/gdk-pixbuf/gdk-pixbuf-scale.c @@ -97,9 +97,20 @@ gdk_pixbuf_scale (const GdkPixbuf *src, * @overall_alpha: overall alpha for source image (0..255) * * Creates a transformation of the source image @src by scaling by - * @scale_x and @scale_y then translating by @offset_x and @offset_y, - * then composites the rectangle (@dest_x, @dest_y, @dest_width, - * @dest_height) of the resulting image onto the destination image. + * @scale_x and @scale_y then translating by @offset_x and @offset_y. + * This gives an image in the coordinates of the destination pixbuf. + * The rectangle (@dest_x, @dest_y, @dest_width, @dest_height) + * is then composited onto the corresponding rectangle of the + * original destination image. + * + * When the destination rectangle contains parts not in the source + * image, the data at the edges of the source image is replicated + * to infinity. + * + * <figure id="pixbuf-composite-diagram"> + * <title>Compositing of pixbufs</title> + * <graphic fileref="composite.png" format="PNG"/> + * </figure> **/ void gdk_pixbuf_composite (const GdkPixbuf *src, |