[Commit] cairo/src cairo.c, 1.5, 1.6 cairo.h, 1.6, 1.7 cairo_gstate.c, 1.5, 1.6 cairoint.h, 1.9, 1.10

[Carl Worth]

Committed by: cworth

Update of /local/src/CVS/cairo/src
In directory home.keithp.com:/tmp/cvs-serv10500/src

Modified Files:
	cairo.c cairo.h cairo_gstate.c cairoint.h 
Log Message:
Add implementation of cairo_get_matrix

Index: cairo.c
===================================================================
RCS file: /local/src/CVS/cairo/src/cairo.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cairo.c	1 Aug 2003 05:41:44 -0000	1.5
+++ cairo.c	3 Sep 2003 14:14:19 -0000	1.6
@@ -688,6 +688,12 @@
     return _cairo_gstate_get_miter_limit (cr->gstate);
 }
 
+void
+cairo_get_matrix (cairo_t *cr, cairo_matrix_t *matrix)
+{
+    _cairo_gstate_get_matrix (cr->gstate, matrix);
+}
+
 cairo_surface_t *
 cairo_get_target_surface (cairo_t *cr)
 {

Index: cairo.h
===================================================================
RCS file: /local/src/CVS/cairo/src/cairo.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cairo.h	30 Aug 2003 00:57:08 -0000	1.6
+++ cairo.h	3 Sep 2003 14:14:19 -0000	1.7
@@ -370,10 +370,7 @@
 /* XXX: How to do cairo_get_dash??? Do we want to switch to a cairo_dash object? */
 
 extern void __external_linkage
-cairo_get_matrix (cairo_t *cr,
-	    double *a, double *b,
-	    double *c, double *d,
-	    double *tx, double *ty);
+cairo_get_matrix (cairo_t *cr, cairo_matrix_t *matrix);
 
 extern cairo_surface_t * __external_linkage
 cairo_get_target_surface (cairo_t *cr);

Index: cairo_gstate.c
===================================================================
RCS file: /local/src/CVS/cairo/src/cairo_gstate.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cairo_gstate.c	26 Aug 2003 14:40:17 -0000	1.5
+++ cairo_gstate.c	3 Sep 2003 14:14:19 -0000	1.6
@@ -498,6 +498,12 @@
     return gstate->miter_limit;
 }
 
+void
+_cairo_gstate_get_matrix (cairo_gstate_t *gstate, cairo_matrix_t *matrix)
+{
+    cairo_matrix_copy (matrix, &gstate->ctm);
+}
+
 cairo_status_t
 _cairo_gstate_translate (cairo_gstate_t *gstate, double tx, double ty)
 {

Index: cairoint.h
===================================================================
RCS file: /local/src/CVS/cairo/src/cairoint.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cairoint.h	26 Aug 2003 14:40:18 -0000	1.9
+++ cairoint.h	3 Sep 2003 14:14:19 -0000	1.10
@@ -456,6 +456,9 @@
 extern double __internal_linkage
 _cairo_gstate_get_miter_limit (cairo_gstate_t *gstate);
 
+extern void __internal_linkage
+_cairo_gstate_get_matrix (cairo_gstate_t *gstate, cairo_matrix_t *matrix);
+
 extern cairo_status_t __internal_linkage
 _cairo_gstate_translate (cairo_gstate_t *gstate, double tx, double ty);