diff options
author | Owen Taylor <otaylor@redhat.com> | 2005-08-23 05:18:48 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@redhat.com> | 2005-08-23 05:18:48 +0000 |
commit | 099060f9254e972ae2d28f51815b75da01736a8f (patch) | |
tree | f7a51326aec8560483306beffe1ef385e03f67ca /src/cairo-matrix.c | |
parent | 704874c16538f0653f37be253f2fc3d89963667d (diff) |
Some fixes for warnings from sparse (Part of #4208, Kjartan Maraas)
Use NULL, not 0.
Fix C99'ism of mixed code and declarations.
Diffstat (limited to 'src/cairo-matrix.c')
-rw-r--r-- | src/cairo-matrix.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/cairo-matrix.c b/src/cairo-matrix.c index 236678a8c..4073ea4eb 100644 --- a/src/cairo-matrix.c +++ b/src/cairo-matrix.c @@ -82,6 +82,7 @@ slim_hidden_def(cairo_matrix_init_identity); void cairo_matrix_init (cairo_matrix_t *matrix, double xx, double yx, + double xy, double yy, double x0, double y0) { @@ -680,19 +681,19 @@ _cairo_matrix_is_integer_translation(const cairo_matrix_t *m, 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)); |