From e01fc6bba7f90c80e86b206f28efa3f1f94a083b Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Sun, 12 Jul 2009 18:55:45 -0400 Subject: [PATCH] Reindent and reformat pixman-conical-gradient.c --- pixman/pixman-conical-gradient.c | 138 +++++++++++++++++++++++---------------- 1 file changed, 81 insertions(+), 57 deletions(-) diff --git a/pixman/pixman-conical-gradient.c b/pixman/pixman-conical-gradient.c index 8e7d1c5..6a4e31e 100644 --- a/pixman/pixman-conical-gradient.c +++ b/pixman/pixman-conical-gradient.c @@ -29,15 +29,19 @@ #include "pixman-private.h" static void -conical_gradient_get_scanline_32 (pixman_image_t *image, int x, int y, - int width, uint32_t *buffer, - const uint32_t *mask, uint32_t mask_bits) +conical_gradient_get_scanline_32 (pixman_image_t *image, + int x, + int y, + int width, + uint32_t * buffer, + const uint32_t *mask, + uint32_t mask_bits) { source_image_t *source = (source_image_t *)image; gradient_t *gradient = (gradient_t *)source; conical_gradient_t *conical = (conical_gradient_t *)image; uint32_t *end = buffer + width; - pixman_gradient_walker_t walker; + pixman_gradient_walker_t walker; pixman_bool_t affine = TRUE; double cx = 1.; double cy = 0.; @@ -45,73 +49,92 @@ conical_gradient_get_scanline_32 (pixman_image_t *image, int x, int y, double rx = x + 0.5; double ry = y + 0.5; double rz = 1.; - double a = conical->angle/(180.*65536); + double a = conical->angle / (180. * 65536); _pixman_gradient_walker_init (&walker, gradient, source->common.repeat); - - if (source->common.transform) { + + if (source->common.transform) + { pixman_vector_t v; + /* reference point is the center of the pixel */ - v.vector[0] = pixman_int_to_fixed(x) + pixman_fixed_1/2; - v.vector[1] = pixman_int_to_fixed(y) + pixman_fixed_1/2; + v.vector[0] = pixman_int_to_fixed (x) + pixman_fixed_1 / 2; + v.vector[1] = pixman_int_to_fixed (y) + pixman_fixed_1 / 2; v.vector[2] = pixman_fixed_1; + if (!pixman_transform_point_3d (source->common.transform, &v)) return; + + cx = source->common.transform->matrix[0][0] / 65536.; + cy = source->common.transform->matrix[1][0] / 65536.; + cz = source->common.transform->matrix[2][0] / 65536.; - cx = source->common.transform->matrix[0][0]/65536.; - cy = source->common.transform->matrix[1][0]/65536.; - cz = source->common.transform->matrix[2][0]/65536.; - rx = v.vector[0]/65536.; - ry = v.vector[1]/65536.; - rz = v.vector[2]/65536.; - affine = source->common.transform->matrix[2][0] == 0 && v.vector[2] == pixman_fixed_1; - } - - if (affine) { - rx -= conical->center.x/65536.; - ry -= conical->center.y/65536.; + rx = v.vector[0] / 65536.; + ry = v.vector[1] / 65536.; + rz = v.vector[2] / 65536.; - while (buffer < end) { + affine = + source->common.transform->matrix[2][0] == 0 && + v.vector[2] == pixman_fixed_1; + } + + if (affine) + { + rx -= conical->center.x / 65536.; + ry -= conical->center.y / 65536.; + + while (buffer < end) + { double angle; - + if (!mask || *mask++ & mask_bits) { - pixman_fixed_48_16_t t; - - angle = atan2(ry, rx) + a; - t = (pixman_fixed_48_16_t) (angle * (65536. / (2*M_PI))); - - *(buffer) = _pixman_gradient_walker_pixel (&walker, t); + pixman_fixed_48_16_t t; + + angle = atan2 (ry, rx) + a; + t = (pixman_fixed_48_16_t) (angle * (65536. / (2 * M_PI))); + + *buffer = _pixman_gradient_walker_pixel (&walker, t); } - + ++buffer; + rx += cx; ry += cy; } - } else { - while (buffer < end) { + } + else + { + while (buffer < end) + { double x, y; double angle; - + if (!mask || *mask++ & mask_bits) { - pixman_fixed_48_16_t t; - - if (rz != 0) { - x = rx/rz; - y = ry/rz; - } else { + pixman_fixed_48_16_t t; + + if (rz != 0) + { + x = rx / rz; + y = ry / rz; + } + else + { x = y = 0.; } - x -= conical->center.x/65536.; - y -= conical->center.y/65536.; - angle = atan2(y, x) + a; - t = (pixman_fixed_48_16_t) (angle * (65536. / (2*M_PI))); + + x -= conical->center.x / 65536.; + y -= conical->center.y / 65536.; - *(buffer) = _pixman_gradient_walker_pixel (&walker, t); + angle = atan2 (y, x) + a; + t = (pixman_fixed_48_16_t) (angle * (65536. / (2 * M_PI))); + + *buffer = _pixman_gradient_walker_pixel (&walker, t); } - + ++buffer; + rx += cx; ry += cy; rz += cz; @@ -127,32 +150,33 @@ conical_gradient_property_changed (pixman_image_t *image) } PIXMAN_EXPORT pixman_image_t * -pixman_image_create_conical_gradient (pixman_point_fixed_t *center, - pixman_fixed_t angle, - const pixman_gradient_stop_t *stops, - int n_stops) +pixman_image_create_conical_gradient (pixman_point_fixed_t * center, + pixman_fixed_t angle, + const pixman_gradient_stop_t *stops, + int n_stops) { - pixman_image_t *image = _pixman_image_allocate(); + pixman_image_t *image = _pixman_image_allocate (); conical_gradient_t *conical; - + if (!image) return NULL; - + conical = &image->conical; - + if (!_pixman_init_gradient (&conical->common, stops, n_stops)) { free (image); return NULL; } - + image->type = CONICAL; conical->center = *center; conical->angle = angle; - + image->common.property_changed = conical_gradient_property_changed; - + conical_gradient_property_changed (image); - + return image; } + -- 2.7.4