summaryrefslogtreecommitdiff
path: root/src/cairo.c
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2008-09-25 15:40:28 -0700
committerCarl Worth <cworth@cworth.org>2008-09-25 15:56:57 -0700
commit1d896aa9d89ff79239b3754da617201968072ea1 (patch)
treea6fd6567641a87e300ce0dfcc11ee3d21295e040 /src/cairo.c
parent483ab915c0fd891dffc0390ba4a1c96c1f06e30f (diff)
Actually remove cairo_has_show_text_glyphs
The release notes for 1.7.6 say that we had dropped this function, but apparently we had only planned to do that and didn't actually get around to it until now. Thanks to the RELEASING insctructions which gave a diff command that pointed out this problem.
Diffstat (limited to 'src/cairo.c')
-rw-r--r--src/cairo.c36
1 files changed, 5 insertions, 31 deletions
diff --git a/src/cairo.c b/src/cairo.c
index cdfefa02..9bb2b663 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -3079,6 +3079,7 @@ cairo_show_text (cairo_t *cr, const char *utf8)
int utf8_len, num_glyphs, num_clusters;
cairo_text_cluster_flags_t cluster_flags;
double x, y;
+ cairo_bool_t has_show_text_glyphs;
if (cr->status)
return;
@@ -3090,11 +3091,14 @@ cairo_show_text (cairo_t *cr, const char *utf8)
utf8_len = strlen (utf8);
+ has_show_text_glyphs =
+ cairo_surface_has_show_text_glyphs (cairo_get_target (cr));
+
status = _cairo_gstate_text_to_glyphs (cr->gstate,
x, y,
utf8, utf8_len,
&glyphs, &num_glyphs,
- cairo_has_show_text_glyphs (cr) ? &clusters : NULL, &num_clusters,
+ has_show_text_glyphs ? &clusters : NULL, &num_clusters,
&cluster_flags);
if (status)
goto BAIL;
@@ -3170,36 +3174,6 @@ cairo_show_glyphs (cairo_t *cr, const cairo_glyph_t *glyphs, int num_glyphs)
}
/**
- * cairo_has_show_text_glyphs:
- * @cr: a cairo context
- *
- * Returns whether the target surface of a cairo context supports
- * sophisticated cairo_show_text_glyphs() operations. That is,
- * whether it actually uses the provided text and cluster data
- * to a cairo_show_text_glyphs() call.
- *
- * Note: Even if this function returns %FALSE, a
- * cairo_show_text_glyphs() operation will still succeed. It just will
- * act like a cairo_show_glyphs() operation. Users can use this
- * function to avoid computing UTF-8 text and cluster mapping if the
- * target surface does not use it.
- *
- * This is a convenience function that simply calls
- * cairo_surface_has_show_text_glyphs() on @cr's target.
- *
- * Return value: %TRUE if the target surface of @cr supports
- * cairo_show_text_glyphs(), %FALSE otherwise
- *
- * Since: 1.8
- **/
-cairo_bool_t
-cairo_has_show_text_glyphs (cairo_t *cr)
-{
- return _cairo_gstate_has_show_text_glyphs (cr->gstate);
-}
-slim_hidden_def (cairo_has_show_text_glyphs);
-
-/**
* cairo_show_text_glyphs:
* @cr: a cairo context
* @utf8: a string of text encoded in UTF-8