[cairo-commit] cairo/src cairo-png.c,1.9,1.10 cairo.h,1.104,1.105

[Owen Taylor]

Committed by: otaylor

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv21523/src

Modified Files:
	cairo-png.c cairo.h 
Log Message:
2005-04-26  Owen Taylor  <otaylor at redhat.com>

        * doc/public/cairo-sections.txt: Updated.

        * src/cairo-png.c src/cairo.h: Fix up some doc build issues.


Index: cairo-png.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-png.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cairo-png.c	26 Apr 2005 04:36:39 -0000	1.9
+++ cairo-png.c	26 Apr 2005 22:28:02 -0000	1.10
@@ -187,7 +187,7 @@
 /**
  * cairo_surface_write_to_png:
  * @surface: a #cairo_surface_t with pixel contents
- * @file: a #FILE opened in write mode
+ * @filename: the name of a file to write to
  * 
  * Writes the image surface to the given #FILE pointer.  The file
  * should be opened in write mode and binary mode if applicable.
@@ -282,22 +282,6 @@
     }
 }
 
-/**
- * cairo_image_surface_create_from_png:
- * @file: a #FILE 
- * @width: if not %NULL, the width of the image surface is written to
- *   this address
- * @height: if not %NULL, the height of the image surface is written to
- *   this address
- * 
- * Creates a new image surface and initializes the contents to the
- * given PNG file.  If width or height are not %NULL the dimensions of
- * the image surface will be written to those addresses.
- * 
- * Return value: a new #cairo_surface_t initialized with the contents
- * of the PNG file or %NULL if the file is not a valid PNG file or
- * memory could not be allocated for the operation.
- **/
 static cairo_surface_t *
 read_png (png_rw_ptr	read_func,
 	  void		*closure)
@@ -456,13 +440,14 @@
 
 /**
  * cairo_image_surface_create_from_png_stream:
- * @file: a #FILE 
+ * @read_func: function called to read the data of the file
+ * @closure: data to pass to @read_func.
  * 
- * Creates a new image surface and initializes the contents to the
- * given PNG file.
+ * Creates a new image surface from PNG data read incrementally
+ * via the @read_func function.
  * 
  * Return value: a new #cairo_surface_t initialized with the contents
- * of the PNG file or %NULL if the file is not a valid PNG file or
+ * of the PNG file or %NULL if the data read is not a valid PNG image or
  * memory could not be allocated for the operation.
  **/
 cairo_surface_t *

Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- cairo.h	26 Apr 2005 19:38:06 -0000	1.104
+++ cairo.h	26 Apr 2005 22:28:02 -0000	1.105
@@ -271,7 +271,7 @@
 cairo_set_operator (cairo_t *cr, cairo_operator_t op);
 
 void
-cairo_set_source (cairo_t *cr, cairo_pattern_t *pattern);
+cairo_set_source (cairo_t *cr, cairo_pattern_t *source);
 
 /* XXX: NYI:
 void