[lasem] svg_view: remove useless subregion parameter of filter functions.

[Emmanuel Pacaud <emmanuel src gnome org>]

commit 96236ce72e5faf505fdeeb4f7edf60b30c93cb64
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Sun Oct 21 22:02:47 2012 +0200

    svg_view: remove useless subregion parameter of filter functions.

 src/lsmcairo.c   |   38 ++++++++++++--------------------------
 src/lsmcairo.h   |   11 ++++-------
 src/lsmsvgview.c |   10 +++++-----
 3 files changed, 21 insertions(+), 38 deletions(-)
---
diff --git a/src/lsmcairo.c b/src/lsmcairo.c
index bfe2ee6..e39b880 100644
--- a/src/lsmcairo.c
+++ b/src/lsmcairo.c
@@ -311,7 +311,6 @@ lsm_filter_surface_fast_blur (LsmFilterSurface *input,
 
 void
 lsm_filter_surface_flood (LsmFilterSurface *surface,
-			  const LsmBox *subregion,
 			  double red,
 			  double green,
 			  double blue,
@@ -322,10 +321,8 @@ lsm_filter_surface_flood (LsmFilterSurface *surface,
 	g_return_if_fail (surface != NULL);
 
 	cairo = cairo_create (surface->surface);
-	if (subregion != NULL) {
-		cairo_rectangle (cairo, subregion->x, subregion->y, subregion->width, subregion->height);
-		cairo_clip (cairo);
-	}
+	cairo_rectangle (cairo, surface->subregion.x, surface->subregion.y, surface->subregion.width, surface->subregion.height);
+	cairo_clip (cairo);
 	cairo_set_source_rgba (cairo, red, green, blue, opacity);
 	cairo_paint (cairo);
 }
@@ -334,7 +331,6 @@ void
 lsm_filter_surface_blend (LsmFilterSurface *input_1,
 			  LsmFilterSurface *input_2,
 			  LsmFilterSurface *output,
-			  const LsmBox *subregion,
 			  int blending_mode)
 {
 	cairo_t *cairo;
@@ -375,10 +371,8 @@ lsm_filter_surface_blend (LsmFilterSurface *input_1,
 	}
 
 	cairo = cairo_create (output->surface);
-	if (subregion != NULL) {
-		cairo_rectangle (cairo, subregion->x, subregion->y, subregion->width, subregion->height);
-		cairo_clip (cairo);
-	}
+	cairo_rectangle (cairo, output->subregion.x, output->subregion.y, output->subregion.width, output->subregion.height);
+	cairo_clip (cairo);
 	cairo_set_source_surface (cairo, input_2->surface, 0, 0);
 	cairo_paint (cairo);
 	cairo_set_source_surface (cairo, input_1->surface, 0, 0);
@@ -390,7 +384,6 @@ lsm_filter_surface_blend (LsmFilterSurface *input_1,
 void
 lsm_filter_surface_offset (LsmFilterSurface *input,
 			   LsmFilterSurface *output,
-			   const LsmBox *subregion,
 			   int dx, int dy)
 {
 	cairo_t *cairo;
@@ -399,10 +392,8 @@ lsm_filter_surface_offset (LsmFilterSurface *input,
 	g_return_if_fail (output != NULL);
 
 	cairo = cairo_create (output->surface);
-	if (subregion != NULL) {
-		cairo_rectangle (cairo, subregion->x, subregion->y, subregion->width, subregion->height);
-		cairo_clip (cairo);
-	}
+	cairo_rectangle (cairo, output->subregion.x, output->subregion.y, output->subregion.width, output->subregion.height);
+	cairo_clip (cairo);
 	cairo_set_source_surface (cairo, input->surface, dx, dy);
 	cairo_paint (cairo);
 	cairo_destroy (cairo);
@@ -410,8 +401,7 @@ lsm_filter_surface_offset (LsmFilterSurface *input,
 
 void
 lsm_filter_surface_merge (LsmFilterSurface *input,
-			  LsmFilterSurface *output,
-			  const LsmBox *subregion)
+			  LsmFilterSurface *output)
 {
 	cairo_t *cairo;
 
@@ -419,17 +409,15 @@ lsm_filter_surface_merge (LsmFilterSurface *input,
 	g_return_if_fail (output != NULL);
 
 	cairo = cairo_create (output->surface);
-	if (subregion != NULL) {
-		cairo_rectangle (cairo, subregion->x, subregion->y, subregion->width, subregion->height);
-		cairo_clip (cairo);
-	}
+	cairo_rectangle (cairo, output->subregion.x, output->subregion.y, output->subregion.width, output->subregion.height);
+	cairo_clip (cairo);
 	cairo_set_source_surface (cairo, input->surface, 0, 0);
 	cairo_paint (cairo);
 	cairo_destroy (cairo);
 }
 
 void
-lsm_filter_surface_tile (LsmFilterSurface *input, LsmFilterSurface *output, const LsmBox *subregion)
+lsm_filter_surface_tile (LsmFilterSurface *input, LsmFilterSurface *output)
 {
 	cairo_t *cairo;
 	cairo_surface_t *surface;
@@ -445,10 +433,8 @@ lsm_filter_surface_tile (LsmFilterSurface *input, LsmFilterSurface *output, cons
 	cairo_destroy (cairo);
 
 	cairo = cairo_create (output->surface);
-	if (subregion != NULL) {
-		cairo_rectangle (cairo, subregion->x, subregion->y, subregion->width, subregion->height);
-		cairo_clip (cairo);
-	}
+	cairo_rectangle (cairo, output->subregion.x, output->subregion.y, output->subregion.width, output->subregion.height);
+	cairo_clip (cairo);
 	cairo_set_source_surface (cairo, surface, 0, 0);
 	pattern = cairo_get_source (cairo);
 	cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
diff --git a/src/lsmcairo.h b/src/lsmcairo.h
index d3533a1..44f5332 100644
--- a/src/lsmcairo.h
+++ b/src/lsmcairo.h
@@ -52,17 +52,14 @@ void 			lsm_filter_surface_alpha 		(LsmFilterSurface *input, LsmFilterSurface *o
 void 			lsm_filter_surface_blend 		(LsmFilterSurface *input_1,
 								 LsmFilterSurface *input_2,
 								 LsmFilterSurface *output,
-								 const LsmBox *subregion,
 								 int blending_mode);
 void 			lsm_filter_surface_fast_blur 		(LsmFilterSurface *input, LsmFilterSurface *output, double sx, double sy);
-void 			lsm_filter_surface_flood 		(LsmFilterSurface *surface, const LsmBox *subregion,
+void 			lsm_filter_surface_flood 		(LsmFilterSurface *surface,
 								 double red, double green, double blue, double opacity);
 void 			lsm_filter_surface_offset 		(LsmFilterSurface *input, LsmFilterSurface *output,
-								const LsmBox *subregion, int dx, int dy);
-void 			lsm_filter_surface_merge 		(LsmFilterSurface *input, LsmFilterSurface *output,
-								 const LsmBox *subregion);
-void 			lsm_filter_surface_tile 		(LsmFilterSurface *input, LsmFilterSurface *output,
-								 const LsmBox *subregion);
+								 int dx, int dy);
+void 			lsm_filter_surface_merge 		(LsmFilterSurface *input, LsmFilterSurface *output);
+void 			lsm_filter_surface_tile 		(LsmFilterSurface *input, LsmFilterSurface *output);
 
 void 			lsm_cairo_box_user_to_device 		(cairo_t *cairo, LsmBox *to, const LsmBox *from);
 void 			lsm_cairo_box_device_to_user 		(cairo_t *cairo, LsmBox *to, const LsmBox *from);
diff --git a/src/lsmsvgview.c b/src/lsmsvgview.c
index e5adfdf..f06ca16 100644
--- a/src/lsmsvgview.c
+++ b/src/lsmsvgview.c
@@ -2130,7 +2130,7 @@ lsm_svg_view_apply_blend (LsmSvgView *view, const char *input_1, const char*inpu
 
 	lsm_log_render ("[SvgView::blend] mode = %s", lsm_svg_blending_mode_to_string (mode));
 
-	lsm_filter_surface_blend (input_1_surface, input_2_surface, output_surface, &subregion_px, mode);
+	lsm_filter_surface_blend (input_1_surface, input_2_surface, output_surface, mode);
 }
 
 void
@@ -2151,7 +2151,7 @@ lsm_svg_view_apply_flood (LsmSvgView *view, const char *output, const LsmBox *su
 		        subregion_px.width, subregion_px.height,
 		        subregion_px.x, subregion_px.y);
 
-	lsm_filter_surface_flood (output_surface, &subregion_px,
+	lsm_filter_surface_flood (output_surface,
 				  view->style->flood_color->value.red,
 				  view->style->flood_color->value.green,
 				  view->style->flood_color->value.blue,
@@ -2217,7 +2217,7 @@ lsm_svg_view_apply_offset (LsmSvgView *view, const char *input, const char *outp
 
 	lsm_log_render ("[SvgView::apply_offset] %g px,%g px", dx, dy);
 
-	lsm_filter_surface_offset (input_surface, output_surface, &subregion_px, dx, dy);
+	lsm_filter_surface_offset (input_surface, output_surface, dx, dy);
 }
 
 void
@@ -2242,7 +2242,7 @@ lsm_svg_view_apply_merge (LsmSvgView *view, const char *input, const char *outpu
 		output_surface = _create_filter_surface (view, output, input_surface, &subregion_px);
 
 	if (output_surface != NULL)
-		lsm_filter_surface_merge (input_surface, output_surface, &subregion_px);
+		lsm_filter_surface_merge (input_surface, output_surface);
 }
 
 void
@@ -2262,7 +2262,7 @@ lsm_svg_view_apply_tile (LsmSvgView *view, const char *input, const char *output
 	lsm_cairo_box_user_to_device (view->dom_view.cairo, &subregion_px, subregion);
 	output_surface = _create_filter_surface (view, output, input_surface, &subregion_px);
 
-	lsm_filter_surface_tile (input_surface, output_surface, &subregion_px);
+	lsm_filter_surface_tile (input_surface, output_surface);
 }
 
 void