[cairo-commit] cairo/src cairo-gstate.c, 1.126, 1.127 cairo.c, 1.92, 1.93 cairo.h, 1.118, 1.119 cairoint.h, 1.138, 1.139

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv20066/src

Modified Files:
	cairo-gstate.c cairo.c cairo.h cairoint.h 
Log Message:

        * src/cairo-gstate.c: (_cairo_gstate_get_font_matrix):
        * src/cairo.c: (cairo_get_font_matrix):
        * src/cairo.h:
        * src/cairoint.h: Fix cairo_get_font_matrix to actually use its
        out-parameter. And change the return type to void.


Index: cairo-gstate.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-gstate.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- cairo-gstate.c	9 May 2005 16:12:52 -0000	1.126
+++ cairo-gstate.c	10 May 2005 19:22:41 -0000	1.127
@@ -1734,10 +1734,11 @@
     return CAIRO_STATUS_SUCCESS;
 }
 
-cairo_matrix_t
-_cairo_gstate_get_font_matrix (cairo_gstate_t *gstate)
+void
+_cairo_gstate_get_font_matrix (cairo_gstate_t *gstate,
+			       cairo_matrix_t *matrix)
 {
-    return gstate->font_matrix;
+    *matrix = gstate->font_matrix;
 }
 
 cairo_status_t

Index: cairo.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- cairo.c	9 May 2005 16:12:52 -0000	1.92
+++ cairo.c	10 May 2005 19:22:41 -0000	1.93
@@ -1653,16 +1653,16 @@
 /**
  * cairo_get_font_matrix
  * @cr: a #cairo_t
+ * @matrix: return value for the matrix
  *
- * Gets the current font matrix. See cairo_set_font_matrix()
- *
- * Return value: the current font matrix
+ * Stores the current font matrix into @matrix. See
+ * cairo_set_font_matrix().
  **/
-cairo_matrix_t
+void
 cairo_get_font_matrix (cairo_t *cr, cairo_matrix_t *matrix)
 {
     CAIRO_CHECK_SANITY (cr);
-    return _cairo_gstate_get_font_matrix (cr->gstate);
+    _cairo_gstate_get_font_matrix (cr->gstate, matrix);
 }
 
 /**

Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- cairo.h	9 May 2005 17:41:17 -0000	1.118
+++ cairo.h	10 May 2005 19:22:41 -0000	1.119
@@ -655,8 +655,9 @@
 cairo_set_font_matrix (cairo_t		    *cr,
 		       const cairo_matrix_t *matrix);
 
-cairo_matrix_t
-cairo_get_font_matrix (cairo_t *cr, cairo_matrix_t *matrix);
+void
+cairo_get_font_matrix (cairo_t *cr,
+		       cairo_matrix_t *matrix);
 
 void
 cairo_show_text (cairo_t *cr, const char *utf8);

Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- cairoint.h	9 May 2005 16:12:52 -0000	1.138
+++ cairoint.h	10 May 2005 19:22:41 -0000	1.139
@@ -1122,8 +1122,9 @@
 _cairo_gstate_set_font_size (cairo_gstate_t *gstate, 
 			     double          size);
 
-cairo_matrix_t
-_cairo_gstate_get_font_matrix (cairo_gstate_t *gstate);
+void
+_cairo_gstate_get_font_matrix (cairo_gstate_t *gstate,
+			       cairo_matrix_t *matrix);
      
 cairo_private cairo_status_t
 _cairo_gstate_set_font_matrix (cairo_gstate_t	    *gstate,