[cairo-commit] cairo/src cairo-matrix.c,1.32,1.33

[Owen Taylor]

Committed by: otaylor

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

Modified Files:
	cairo-matrix.c 
Log Message:
2005-08-23  Owen Taylor  <otaylor at redhat.com>

        Some fixes for warnings from sparse (Part of #4208,
        Kjartan Maraas)

        * test/cairo-test.c (create_xlib_surface): Use NULL, not 0.

        * src/cairo-matrix.c (_cairo_matrix_transformed_circle_major_axis):
        Fix C99'ism of mixed code and declarations.


Index: cairo-matrix.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-matrix.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- cairo-matrix.c	22 Aug 2005 23:52:40 -0000	1.32
+++ cairo-matrix.c	23 Aug 2005 12:18:48 -0000	1.33
@@ -82,6 +82,7 @@
 void
 cairo_matrix_init (cairo_matrix_t *matrix,
 		   double xx, double yx,
+
 		   double xy, double yy,
 		   double x0, double y0)
 {
@@ -680,19 +681,19 @@
 double
 _cairo_matrix_transformed_circle_major_axis (cairo_matrix_t *matrix, double radius)
 {
-    double  a, b, c, d;
+    double  a, b, c, d, f, g, h, i, j;
 
     _cairo_matrix_get_affine (matrix,
                               &a, &b,
                               &c, &d,
                               NULL, NULL);
 
-    double  i = a*a + b*b;
-    double  j = c*c + d*d;
+    i = a*a + b*b;
+    j = c*c + d*d;
 
-    double  f = 0.5 * (i + j);
-    double  g = 0.5 * (i - j);
-    double  h = a*c + b*d;
+    f = 0.5 * (i + j);
+    g = 0.5 * (i - j);
+    h = a*c + b*d;
 
     return radius * sqrt (f + sqrt (g*g+h*h));