[cairo-commit] cairo/src cairo-glitz-surface.c,1.29,1.30

[Dave Beckett]

Committed by: dajobe

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

Modified Files:
	cairo-glitz-surface.c 
Log Message:
2005-04-08  Dave Beckett  <Dave.Beckett at bristol.ac.uk>

	* src/cairo-glitz-surface.c (_cairo_glitz_surface_set_matrix):
	Update to track changes to cairo_matrix_t interface.


Index: cairo-glitz-surface.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-glitz-surface.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- cairo-glitz-surface.c	7 Apr 2005 21:25:00 -0000	1.29
+++ cairo-glitz-surface.c	8 Apr 2005 19:42:36 -0000	1.30
@@ -378,17 +378,17 @@
 {
     glitz_transform_t transform;
 
-    transform.matrix[0][0] = _cairo_fixed_from_double (matrix->m[0][0]);
-    transform.matrix[0][1] = _cairo_fixed_from_double (matrix->m[1][0]);
-    transform.matrix[0][2] = _cairo_fixed_from_double (matrix->m[2][0]);
+    transform.matrix[0][0] = _cairo_fixed_from_double (matrix->xx);
+    transform.matrix[0][1] = _cairo_fixed_from_double (matrix->xy);
+    transform.matrix[0][2] = _cairo_fixed_from_double (matrix->x0);
 
-    transform.matrix[1][0] = _cairo_fixed_from_double (matrix->m[0][1]);
-    transform.matrix[1][1] = _cairo_fixed_from_double (matrix->m[1][1]);
-    transform.matrix[1][2] = _cairo_fixed_from_double (matrix->m[2][1]);
+    transform.matrix[1][0] = _cairo_fixed_from_double (matrix->yx);
+    transform.matrix[1][1] = _cairo_fixed_from_double (matrix->yy);
+    transform.matrix[1][2] = _cairo_fixed_from_double (matrix->y0);
 
     transform.matrix[2][0] = 0;
     transform.matrix[2][1] = 0;
-    transform.matrix[2][2] = 1 << 16;
+    transform.matrix[2][2] = _cairo_fixed_from_double (1);
 
     glitz_surface_set_transform (surface->surface, &transform);
 }