[cairo-commit] Branch '1.8' - 4 commits - src/cairo.c src/cairo-font-options.c src/cairo-image-surface.c

[Chris Wilson]

 src/cairo-font-options.c  |    2 +-
 src/cairo-image-surface.c |    2 +-
 src/cairo.c               |   29 +++++++++++++++--------------
 3 files changed, 17 insertions(+), 16 deletions(-)

New commits:
commit ee90a331690bfa88d4460d2fa137f05d64ae9223
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 3 10:51:23 2009 +0100

    [cairo] Doc typo.
    
    Fix conflicting sentence as pointed out by
    https://bugs.freedesktop.org/show_bug.cgi?id=20183

diff --git a/src/cairo.c b/src/cairo.c
index b26bed4..a2e9842 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -3718,10 +3718,6 @@ cairo_get_group_target (cairo_t *cr)
  *    would be returned by cairo_status().</listitem>
  * </orderedlist>
  *
- * In either case, <literal>path->status</literal> will be set to
- * %CAIRO_STATUS_NO_MEMORY (regardless of what the error status in
- * @cr might have been).
- *
  * Return value: the copy of the current path. The caller owns the
  * returned object and should call cairo_path_destroy() when finished
  * with it.
commit bf6e306013f2d65f6e251feaf4fc2f895b7986c3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 3 10:49:16 2009 +0100

    [image] Doc typo.
    
    Correct parameter reference as pointed out by
    https://bugs.freedesktop.org/show_bug.cgi?id=20182

diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
index 4aad77f..21c9be4 100644
--- a/src/cairo-image-surface.c
+++ b/src/cairo-image-surface.c
@@ -449,7 +449,7 @@ slim_hidden_def (cairo_format_stride_for_width);
  * Creates an image surface for the provided pixel data. The output
  * buffer must be kept around until the #cairo_surface_t is destroyed
  * or cairo_surface_finish() is called on the surface.  The initial
- * contents of @buffer will be used as the initial image contents; you
+ * contents of @data will be used as the initial image contents; you
  * must explicitly clear the buffer, using, for example,
  * cairo_rectangle() and cairo_fill() if you want it cleared.
  *
commit 234b2d077c170c1fdd24f7d480521789f2eae5f2
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 3 10:45:51 2009 +0100

    [font-options] Doc typo
    
    Remove duplicate 'with' as pointed out by
    https://bugs.freedesktop.org/show_bug.cgi?id=20180

diff --git a/src/cairo-font-options.c b/src/cairo-font-options.c
index dedd337..b2cb230 100644
--- a/src/cairo-font-options.c
+++ b/src/cairo-font-options.c
@@ -132,7 +132,7 @@ cairo_font_options_copy (const cairo_font_options_t *original)
  * cairo_font_options_destroy:
  * @options: a #cairo_font_options_t
  *
- * Destroys a #cairo_font_options_t object created with with
+ * Destroys a #cairo_font_options_t object created with
  * cairo_font_options_create() or cairo_font_options_copy().
  **/
 void
commit cbdccac88b7d02f1902589462f4f3c5fe7685f9d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 3 10:39:33 2009 +0100

    [cairo] Update documentation for bug 20154
    
    Several typographical errors were pointed out in
    https://bugs.freedesktop.org/show_bug.cgi?id=20154

diff --git a/src/cairo.c b/src/cairo.c
index 5f8d266..b26bed4 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -419,7 +419,7 @@ slim_hidden_def(cairo_push_group);
 /**
  * cairo_push_group_with_content:
  * @cr: a cairo context
- * @content: a %#cairo_content_t indicating the type of group that
+ * @content: a #cairo_content_t indicating the type of group that
  *           will be created
  *
  * Temporarily redirects drawing to an intermediate surface known as a
@@ -903,7 +903,7 @@ cairo_set_fill_rule (cairo_t *cr, cairo_fill_rule_t fill_rule)
  * stroking operation, not the user space and CTM in effect at the
  * time of the call to cairo_set_line_width(). The simplest usage
  * makes both of these spaces identical. That is, if there is no
- * change to the CTM between a call to cairo_set_line_with() and the
+ * change to the CTM between a call to cairo_set_line_width() and the
  * stroking operation, then one can just pass user-space values to
  * cairo_set_line_width() and ignore this note.
  *
@@ -1020,7 +1020,7 @@ slim_hidden_def (cairo_set_line_join);
  *
  * If any value in @dashes is negative, or if all values are 0, then
  * @cr will be put into an error state with a status of
- * #%CAIRO_STATUS_INVALID_DASH.
+ * %CAIRO_STATUS_INVALID_DASH.
  **/
 void
 cairo_set_dash (cairo_t	     *cr,
@@ -1807,6 +1807,12 @@ cairo_rectangle (cairo_t *cr,
     cairo_close_path (cr);
 }
 
+/**
+ * cairo_stroke_to_path:
+ * @cr: a cairo context
+ *
+ * This function is not yet implemented.
+ **/
 #if 0
 /* XXX: NYI */
 void
@@ -2292,10 +2298,9 @@ cairo_in_fill (cairo_t *cr, double x, double y)
  *
  * Computes a bounding box in user coordinates covering the area that
  * would be affected, (the "inked" area), by a cairo_stroke()
- * operation operation given the current path and stroke
- * parameters. If the current path is empty, returns an empty
- * rectangle ((0,0), (0,0)). Surface dimensions and clipping are not
- * taken into account.
+ * operation given the current path and stroke parameters.
+ * If the current path is empty, returns an empty rectangle ((0,0), (0,0)).
+ * Surface dimensions and clipping are not taken into account.
  *
  * Note that if the line width is set to exactly zero, then
  * cairo_stroke_extents() will return an empty rectangle. Contrast with
@@ -2433,10 +2438,10 @@ cairo_clip (cairo_t *cr)
  * effectively masking out any changes to the surface that are outside
  * the current clip region.
  *
- * Calling cairo_clip() can only make the clip region smaller, never
+ * Calling cairo_clip_preserve() can only make the clip region smaller, never
  * larger. But the current clip is part of the graphics state, so a
  * temporary restriction of the clip region can be achieved by
- * calling cairo_clip() within a cairo_save()/cairo_restore()
+ * calling cairo_clip_preserve() within a cairo_save()/cairo_restore()
  * pair. The only other means of increasing the size of the clip
  * region is cairo_reset_clip().
  **/
@@ -3439,7 +3444,7 @@ slim_hidden_def (cairo_get_tolerance);
  * cairo_get_antialias:
  * @cr: a cairo context
  *
- * Gets the current shape antialiasing mode, as set by cairo_set_shape_antialias().
+ * Gets the current shape antialiasing mode, as set by cairo_set_antialias().
  *
  * Return value: the current shape antialiasing mode.
  **/