summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Harrington <b.harrington@samsung.com>2013-09-06 17:02:46 -0700
committerBryce Harrington <b.harrington@samsung.com>2013-09-06 17:02:46 -0700
commit7508d8a3ac47ec4badd1a58d9c9de25319e353f3 (patch)
treedba56453b9a5dc807ff39ca1fdc71503bf23f1fc
parent209e9625c5f31655235bd2b243843bcc4e188308 (diff)
whitespace: For "image: split gaussian filter into 2 passes"cairogles-integration
-rw-r--r--src/cairo-image-filters-private.h4
-rw-r--r--src/cairo-image-filters.c16
-rw-r--r--src/cairo-image-source.c6
3 files changed, 13 insertions, 13 deletions
diff --git a/src/cairo-image-filters-private.h b/src/cairo-image-filters-private.h
index 2761c7b29..a9e47f0b3 100644
--- a/src/cairo-image-filters-private.h
+++ b/src/cairo-image-filters-private.h
@@ -49,8 +49,8 @@
#define MAX_BLUR_SIZE 256
-cairo_private cairo_surface_t *
-_cairo_image_gaussian_filter (cairo_surface_t *src,
+cairo_private cairo_surface_t *
+_cairo_image_gaussian_filter (cairo_surface_t *src,
const cairo_pattern_t *pattern);
#endif /* CAIRO_IMAGE_FILTERS_PRIVATE_H */
diff --git a/src/cairo-image-filters.c b/src/cairo-image-filters.c
index d46a88405..6789141ae 100644
--- a/src/cairo-image-filters.c
+++ b/src/cairo-image-filters.c
@@ -66,7 +66,7 @@ _pixman_image_create_convolution_params (double *params,
if (x_pass) {
pixman_params = _cairo_malloc_ab (col + 2, sizeof (double));
- pixman_params[0] = pixman_int_to_fixed (col);
+ pixman_params[0] = pixman_int_to_fixed (col);
pixman_params[1] = pixman_int_to_fixed (1);
coef = _cairo_malloc_ab (col, sizeof (double));
memset (coef, 0, sizeof (double) * col);
@@ -75,7 +75,7 @@ _pixman_image_create_convolution_params (double *params,
}
else {
pixman_params = _cairo_malloc_ab (row + 2, sizeof (double));
- pixman_params[0] = pixman_int_to_fixed (1);
+ pixman_params[0] = pixman_int_to_fixed (1);
pixman_params[1] = pixman_int_to_fixed (row);
coef = _cairo_malloc_ab (row, sizeof (double));
memset (coef, 0, sizeof (double) * row);
@@ -91,7 +91,7 @@ _pixman_image_create_convolution_params (double *params,
return pixman_params;
}
-cairo_surface_t *
+cairo_surface_t *
_cairo_image_gaussian_filter (cairo_surface_t *src, const cairo_pattern_t *pattern)
{
int row, col;
@@ -127,7 +127,7 @@ _cairo_image_gaussian_filter (cairo_surface_t *src, const cairo_pattern_t *patt
width = src_width / pattern->shrink_factor_x;
height = src_height / pattern->shrink_factor_y;
stride = width * (src_image->stride / src_width);
-
+
clone_image = (cairo_image_surface_t *)
cairo_image_surface_create (src_image->format,
src_width, src_height);
@@ -137,7 +137,7 @@ _cairo_image_gaussian_filter (cairo_surface_t *src, const cairo_pattern_t *patt
clone_image = (cairo_image_surface_t *)cairo_surface_reference (src);
goto DONE;
}
-
+
/* XXX: we must always create a clone because we need to modify
* it transformation, no copy data */
temp_image = pixman_image_create_bits (src_image->pixman_format,
@@ -150,7 +150,7 @@ _cairo_image_gaussian_filter (cairo_surface_t *src, const cairo_pattern_t *patt
clone_image = (cairo_image_surface_t *)cairo_surface_reference (src);
goto DONE;
}
-
+
/* create scratch images */
for (i = 0; i < 2; i++) {
scratch_images[i] = pixman_image_create_bits (src_image->pixman_format,
@@ -168,7 +168,7 @@ _cairo_image_gaussian_filter (cairo_surface_t *src, const cairo_pattern_t *patt
if (width != src_width && height != src_height) {
pixman_image_set_filter (temp_image, PIXMAN_FILTER_NEAREST, NULL, 0);
/* set up transform matrix */
- cairo_matrix_init_scale (&matrix,
+ cairo_matrix_init_scale (&matrix,
(double) src_width / (double) width,
(double) src_height / (double) height);
status = _cairo_matrix_to_pixman_matrix_offset (&matrix,
@@ -249,7 +249,7 @@ _cairo_image_gaussian_filter (cairo_surface_t *src, const cairo_pattern_t *patt
/* paint scratch_surfaces[0] to clone */
/* set up transform matrix */
- cairo_matrix_init_scale (&matrix,
+ cairo_matrix_init_scale (&matrix,
(double) width / (double) src_width,
(double) height / (double) src_height);
status = _cairo_matrix_to_pixman_matrix_offset (&matrix,
diff --git a/src/cairo-image-source.c b/src/cairo-image-source.c
index 16af73900..95cff90f9 100644
--- a/src/cairo-image-source.c
+++ b/src/cairo-image-source.c
@@ -1018,7 +1018,7 @@ _pixman_image_for_surface (cairo_image_surface_t *dst,
sub->extents.width,
sub->extents.height,
data,
- source->stride);
+ source->stride);
if (unlikely (pixman_image == NULL)) {
if (blurred_surface)
cairo_surface_destroy (blurred_surface);
@@ -1071,7 +1071,7 @@ _pixman_image_for_surface (cairo_image_surface_t *dst,
}
else
/* filter with gaussian */
- blurred_surface = _cairo_image_gaussian_filter (&image->base, &pattern->base);
+ blurred_surface = _cairo_image_gaussian_filter (&image->base, &pattern->base);
cleanup = malloc (sizeof (*cleanup));
if (unlikely (cleanup == NULL)) {
@@ -1091,7 +1091,7 @@ _pixman_image_for_surface (cairo_image_surface_t *dst,
cleanup->image_extra = extra;
pixman_image_set_destroy_function (pixman_image,
_acquire_source_cleanup, cleanup);
- }
+ }
}
if (blurred_surface) {