[cairo] [PATCH] Revert "Change cairo_get_current_point() to return cairo_status_t instead of void"

[Alp Toker]

This reverts commit b3eea75d1f7b56c2046b5387a5eb186d8f154184.

Reverted in favour of an alternative approach.

Conflicts:

	src/cairo.c
---
 src/cairo.c |   22 ++++------------------
 src/cairo.h |    2 +-
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/cairo.c b/src/cairo.c
index b047d99..14bfdc0 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -2925,7 +2925,7 @@ cairo_text_extents (cairo_t              *cr,
     if (utf8 == NULL)
 	return;
 
-    (void) cairo_get_current_point (cr, &x, &y);
+    cairo_get_current_point (cr, &x, &y);
 
     status = _cairo_gstate_text_to_glyphs (cr->gstate, utf8,
 					   x, y,
@@ -3026,7 +3026,7 @@ cairo_show_text (cairo_t *cr, const char *utf8)
     if (utf8 == NULL)
 	return;
 
-    (void) cairo_get_current_point (cr, &x, &y);
+    cairo_get_current_point (cr, &x, &y);
 
     status = _cairo_gstate_text_to_glyphs (cr->gstate, utf8,
 					       x, y,
@@ -3125,7 +3125,7 @@ cairo_text_path  (cairo_t *cr, const char *utf8)
     if (utf8 == NULL)
 	return;
 
-    (void) cairo_get_current_point (cr, &x, &y);
+    cairo_get_current_point (cr, &x, &y);
 
     status = _cairo_gstate_text_to_glyphs (cr->gstate, utf8,
 					   x, y,
@@ -3272,17 +3272,10 @@ cairo_get_antialias (cairo_t *cr)
  *
  * Some functions unset the current path and as a result, current point:
  * cairo_fill(), cairo_stroke().
- *
- * Returns: %CAIRO_STATUS_SUCCESS if current point was successfully
- * retrieved.  Otherwise, if @cr has been in an error status, that status
- * is returned, otherwise %CAIRO_STATUS_NO_CURRENT_POINT is returned if
- * no current point exists.  In all error cases, both @x and @y will be
- * set to 0.0.
  **/
-cairo_status_t
+void
 cairo_get_current_point (cairo_t *cr, double *x_ret, double *y_ret)
 {
-    cairo_status_t status = CAIRO_STATUS_SUCCESS;
     cairo_fixed_t x_fixed, y_fixed;
     double x, y;
 
@@ -3295,11 +3288,6 @@ cairo_get_current_point (cairo_t *cr, double *x_ret, double *y_ret)
     }
     else
     {
-	if (cr->status)
-	    status = cr->status;
-	else
-	    status = CAIRO_STATUS_NO_CURRENT_POINT;
-
 	x = 0.0;
 	y = 0.0;
     }
@@ -3308,8 +3296,6 @@ cairo_get_current_point (cairo_t *cr, double *x_ret, double *y_ret)
 	*x_ret = x;
     if (y_ret)
 	*y_ret = y;
-
-    return status;
 }
 slim_hidden_def(cairo_get_current_point);
 
diff --git a/src/cairo.h b/src/cairo.h
index 0aea4b5..01a6a2e 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -1276,7 +1276,7 @@ cairo_get_tolerance (cairo_t *cr);
 cairo_public cairo_antialias_t
 cairo_get_antialias (cairo_t *cr);
 
-cairo_public cairo_status_t
+cairo_public void
 cairo_get_current_point (cairo_t *cr, double *x, double *y);
 
 cairo_public cairo_fill_rule_t
-- 
1.5.4.2.g41ac4