[cairo-commit] src/cairo-scaled-font.c

Chris Wilson ickle at kemper.freedesktop.org
Mon Oct 26 04:08:47 PDT 2009


 src/cairo-scaled-font.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 1a80cd2aa00b232a9a2192a85d6264e44ffcbd69
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Oct 26 11:05:38 2009 +0000

    scaled-font: Fix documentation examples with incorrect derefs
    
    Bug 24730 -- New: misleading use cases in cairo_scaled_font_text_to_glyphs's docs
    http://bugs.freedesktop.org/show_bug.cgi?id=24730
    
    An apparent copy'n'paste error from the code which has to deal with
    indirect pointers crept into the documentation for the same functions.

diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index 5795d24..e4010e9 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -1612,11 +1612,11 @@ slim_hidden_def (cairo_scaled_font_glyph_extents);
  * if (status == CAIRO_STATUS_SUCCESS) {
  *     cairo_show_text_glyphs (cr,
  *                             utf8, utf8_len,
- *                             *glyphs, *num_glyphs,
- *                             *clusters, *num_clusters, *cluster_flags);
+ *                             glyphs, num_glyphs,
+ *                             clusters, num_clusters, cluster_flags);
  *
- *     cairo_glyph_free (*glyphs);
- *     cairo_text_cluster_free (*clusters);
+ *     cairo_glyph_free (glyphs);
+ *     cairo_text_cluster_free (clusters);
  * }
  * </programlisting></informalexample>
  *
@@ -1635,8 +1635,8 @@ slim_hidden_def (cairo_scaled_font_glyph_extents);
  *                                            NULL);
  *
  * if (status == CAIRO_STATUS_SUCCESS) {
- *     cairo_show_glyphs (cr, *glyphs, *num_glyphs);
- *     cairo_glyph_free (*glyphs);
+ *     cairo_show_glyphs (cr, glyphs, num_glyphs);
+ *     cairo_glyph_free (glyphs);
  * }
  * </programlisting></informalexample>
  *
@@ -1662,13 +1662,13 @@ slim_hidden_def (cairo_scaled_font_glyph_extents);
  * if (status == CAIRO_STATUS_SUCCESS) {
  *     cairo_show_text_glyphs (cr,
  *                             utf8, utf8_len,
- *                             *glyphs, *num_glyphs,
- *                             *clusters, *num_clusters, *cluster_flags);
+ *                             glyphs, num_glyphs,
+ *                             clusters, num_clusters, cluster_flags);
  *
  *     if (glyphs != stack_glyphs)
- *         cairo_glyph_free (*glyphs);
+ *         cairo_glyph_free (glyphs);
  *     if (clusters != stack_clusters)
- *         cairo_text_cluster_free (*clusters);
+ *         cairo_text_cluster_free (clusters);
  * }
  * </programlisting></informalexample>
  *


More information about the cairo-commit mailing list