Add a nice figure to the docs.

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 1921bf07ac78e10ae6be8fa0e96669b7fb9b1f9f..0bacba6dca060c3e7bff6124841f09ac2256a794 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,15 @@
+Sat Jun 19 01:42:20 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gdk-pixbuf/composite.png: Add a figure which tries
+       to expain pixbuf compositing.
+       
+       * gdk-pixbuf/composite.dia: 
+       * gdk-pixbuf/apple-red-1a.png: 
+       * gdk-pixbuf/apple-red-2c.png: 
+       * gdk-pixbuf/gnome-gmush-1.png: Sources for composite.png.
+       
+       * gdk-pixbuf/Makefile.am (HTML_IMAGES): Add composite.png.
+
 Fri Jun 18 21:20:42 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/tmpl/gtktreemodelfilter.sgml: Fix the docs for

diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index d5199d41a1e7aab3070490c9061bed99fb17473c..f65ff0b0c42ccf28d3b5cd3165cd5eba14406acb 100644 (file)
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -57,7 +57,7 @@ content_files =                               \
        gdk-pixbuf-query-loaders.xml
 
 # Images to copy into HTML directory
-HTML_IMAGES = 
+HTML_IMAGES = composite.png
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=
@@ -65,7 +65,12 @@ FIXXREF_OPTIONS=
 include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += version.xml.in \
+       composite.png \
+       composite.dia \
+       apple-red-1a.png \
+       apple-red-2c.png \
+       gnome-gmush-1.png
 
 ########################################################################
 

diff --git a/docs/reference/gdk-pixbuf/apple-red-1a.png b/docs/reference/gdk-pixbuf/apple-red-1a.png
new file mode 100644 (file)
index 0000000..40f1be2
Binary files /dev/null and b/docs/reference/gdk-pixbuf/apple-red-1a.png differ

diff --git a/docs/reference/gdk-pixbuf/apple-red-2c.png b/docs/reference/gdk-pixbuf/apple-red-2c.png
new file mode 100644 (file)
index 0000000..5c96576
Binary files /dev/null and b/docs/reference/gdk-pixbuf/apple-red-2c.png differ

diff --git a/docs/reference/gdk-pixbuf/composite.dia b/docs/reference/gdk-pixbuf/composite.dia
new file mode 100644 (file)
index 0000000..b52bb76
Binary files /dev/null and b/docs/reference/gdk-pixbuf/composite.dia differ

diff --git a/docs/reference/gdk-pixbuf/composite.png b/docs/reference/gdk-pixbuf/composite.png
new file mode 100644 (file)
index 0000000..76b19c2
Binary files /dev/null and b/docs/reference/gdk-pixbuf/composite.png differ

diff --git a/docs/reference/gdk-pixbuf/gnome-gmush-1.png b/docs/reference/gdk-pixbuf/gnome-gmush-1.png
new file mode 100644 (file)
index 0000000..9e6d829
Binary files /dev/null and b/docs/reference/gdk-pixbuf/gnome-gmush-1.png differ

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index a0cddd1adde7579046de027b78d3e0c665b6ff43..d8b1092974a4b69753f20e1800fc97a36f27ee6d 100644 (file)
--- 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 33a0199178a2265a0e4a4e3500a852103e506fa0..cc89946255eabece7080f684c8ee00c1cebb73c8 100644 (file)
--- 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,