[cairo-commit] src/cairo.c src/cairo.h src/cairo-matrix.c src/cairo-pattern.c src/cairo-scaled-font.c

Behdad Esfahbod behdad at kemper.freedesktop.org
Mon May 28 14:05:41 PDT 2007


 src/cairo-matrix.c      |    2 +-
 src/cairo-pattern.c     |    2 +-
 src/cairo-scaled-font.c |    2 +-
 src/cairo.c             |   20 ++++++++++++++------
 src/cairo.h             |    2 +-
 5 files changed, 18 insertions(+), 10 deletions(-)

New commits:
diff-tree 0898411d0abdfa6a02c2fb959b3a668e728fd87c (from 4da50dfa02d7c03c32ee20c15f8304eafa0844e0)
Author: Kouhei Sutou <kou at cozmixng.org>
Date:   Mon May 28 17:05:40 2007 -0400

    [doc] Minor documentation fixes

diff --git a/src/cairo-matrix.c b/src/cairo-matrix.c
index 40828f0..c85b027 100644
--- a/src/cairo-matrix.c
+++ b/src/cairo-matrix.c
@@ -197,7 +197,7 @@ slim_hidden_def(cairo_matrix_init_scale)
  * @sx: scale factor in the X direction
  * @sy: scale factor in the Y direction
  *
- * Applies scaling by @tx, @ty to the transformation in @matrix. The
+ * Applies scaling by @sx, @sy to the transformation in @matrix. The
  * effect of the new transformation is to first scale the coordinates
  * by @sx and @sy, then apply the original transformation to the coordinates.
  **/
diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index 8bbbcfc..9fafc99 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -524,7 +524,7 @@ cairo_pattern_create_linear (double x0, 
  * @radius1: radius of the end circle
  *
  * Creates a new radial gradient cairo_pattern_t between the two
- * circles defined by (x0, y0, c0) and (x1, y1, c0).  Before using the
+ * circles defined by (cx0, cy0, radius0) and (cx1, cy1, radius1).  Before using the
  * gradient pattern, a number of color stops should be defined using
  * cairo_pattern_add_color_stop_rgb() or
  * cairo_pattern_add_color_stop_rgba().
diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index 0d5c76b..ed30cf3 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -802,7 +802,7 @@ cairo_scaled_font_text_extents (cairo_sc
  * graphics state were set to the same font_face, font_matrix, ctm,
  * and font_options as @scaled_font).  Additionally, the x_advance and
  * y_advance values indicate the amount by which the current point
- * would be advanced by cairo_show_glyphs.
+ * would be advanced by cairo_show_glyphs().
  *
  * Note that whitespace glyphs do not contribute to the size of the
  * rectangle (extents.width and extents.height).
diff --git a/src/cairo.c b/src/cairo.c
index 2abc073..5f251c8 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -894,7 +894,7 @@ cairo_set_antialias (cairo_t *cr, cairo_
  * Set the current fill rule within the cairo context. The fill rule
  * is used to determine which regions are inside or outside a complex
  * (potentially self-intersecting) path. The current fill rule affects
- * both cairo_fill and cairo_clip. See #cairo_fill_rule_t for details
+ * both cairo_fill() and cairo_clip(). See #cairo_fill_rule_t for details
  * on the semantics of each available fill rule.
  **/
 void
@@ -2936,7 +2936,7 @@ cairo_show_text (cairo_t *cr, const char
  * @glyphs: array of glyphs to show
  * @num_glyphs: number of glyphs to show
  *
- * A drawing operator that generates the shape from an array  of glyphs,
+ * A drawing operator that generates the shape from an array of glyphs,
  * rendered according to the current font_face, font_size
  * (font_matrix), and font_options.
  **/
@@ -3114,11 +3114,19 @@ cairo_get_antialias (cairo_t *cr)
  *
  * Most path construction functions alter the current point. See the
  * following for details on how they affect the current point:
+ * cairo_new_path(), cairo_new_sub_path(),
+ * cairo_append_path(), cairo_close_path(),
+ * cairo_move_to(), cairo_line_to(), cairo_curve_to(),
+ * cairo_rel_move_to(), cairo_rel_line_to(), cairo_rel_curve_to(),
+ * cairo_arc(), cairo_arc_negative(), cairo_rectangle(),
+ * cairo_text_path(), cairo_glyph_path(), cairo_stroke_to_path()
+ *
+ * Some functions use and alter the current point but do not otherwise
+ * change current path:
+ * cairo_show_text(), cairo_show_glyphs().
  *
- * cairo_new_path(), cairo_move_to(), cairo_line_to(),
- * cairo_curve_to(), cairo_arc(), cairo_rel_move_to(),
- * cairo_rel_line_to(), cairo_rel_curve_to(), cairo_arc(),
- * cairo_text_path(), cairo_stroke_to_path()
+ * Some functions unset the current path and as a result, current point:
+ * cairo_fill(), cairo_stroke().
  **/
 void
 cairo_get_current_point (cairo_t *cr, double *x_ret, double *y_ret)
diff --git a/src/cairo.h b/src/cairo.h
index a80efde..8c3718f 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -895,7 +895,7 @@ typedef enum _cairo_subpixel_order {
 /**
  * cairo_hint_style_t:
  * @CAIRO_HINT_STYLE_DEFAULT: Use the default hint style for
- *   for font backend and target device
+ *   font backend and target device
  * @CAIRO_HINT_STYLE_NONE: Do not hint outlines
  * @CAIRO_HINT_STYLE_SLIGHT: Hint outlines slightly to improve
  *   contrast while retaining good fidelity to the original


More information about the cairo-commit mailing list