Add a figure which tries to expain pixbuf compositing.

Sun Jun 20 00:17:58 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.

docs/reference/ChangeLog

@@ -1,3 +1,15 @@
+Sun Jun 20 00:17:58 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:23:08 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/tmpl/gtktreemodelfilter.sgml: Fix the docs for

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
 
 ########################################################################
 

gdk-pixbuf/ChangeLog

@@ -1,3 +1,8 @@
+Sun Jun 20 00:16:00 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 

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,