Remove srcRepeat and maskRepeat arguments from _pixman_walk_composite_region()

diff --git a/pixman/pixman-fast-path.c b/pixman/pixman-fast-path.c
index 65a291f..33bc0d1 100644 (file)
--- a/pixman/pixman-fast-path.c
+++ b/pixman/pixman-fast-path.c
@@ -1207,7 +1207,6 @@ fast_path_composite (pixman_implementation_t *imp,
                                           mask_x, mask_y,
                                           dest_x, dest_y,
                                           width, height,
-                                          FALSE, FALSE, 
                                           fbCompositeSrcScaleNearest);
            return;
        }

diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
index 4039144..c9fad13 100644 (file)
--- a/pixman/pixman-general.c
+++ b/pixman/pixman-general.c
@@ -261,7 +261,7 @@ general_composite (pixman_implementation_t *        imp,
 {
     _pixman_walk_composite_region (imp, op, src, mask, dest, src_x, src_y,
                                   mask_x, mask_y, dest_x, dest_y, width, height,
-                                  FALSE, FALSE, general_composite_rect);
+                                  general_composite_rect);
 }
 
 static pixman_bool_t

diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 896dfac..70b4dbc 100644 (file)
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -884,20 +884,18 @@ typedef pixman_bool_t (* pixman_fill_func_t) (pixman_implementation_t *imp,
 
 void
 _pixman_walk_composite_region (pixman_implementation_t *imp,
-                             pixman_op_t op,
-                             pixman_image_t * pSrc,
-                             pixman_image_t * pMask,
-                             pixman_image_t * pDst,
-                             int16_t xSrc,
-                             int16_t ySrc,
-                             int16_t xMask,
-                             int16_t yMask,
-                             int16_t xDst,
-                             int16_t yDst,
-                             uint16_t width,
-                             uint16_t height,
-                             pixman_bool_t srcRepeat,
-                             pixman_bool_t maskRepeat,
+                              pixman_op_t op,
+                              pixman_image_t * pSrc,
+                              pixman_image_t * pMask,
+                              pixman_image_t * pDst,
+                              int16_t xSrc,
+                              int16_t ySrc,
+                              int16_t xMask,
+                              int16_t yMask,
+                              int16_t xDst,
+                              int16_t yDst,
+                              uint16_t width,
+                              uint16_t height,
                               pixman_composite_func_t compositeRect);
 
 void _pixman_setup_combiner_functions_32 (pixman_implementation_t *imp);

diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c
index 5f218eb..332d881 100644 (file)
--- a/pixman/pixman-utils.c
+++ b/pixman/pixman-utils.c
@@ -635,15 +635,12 @@ _pixman_walk_composite_region (pixman_implementation_t *imp,
                               int16_t yDst,
                               uint16_t width,
                               uint16_t height,
-                              pixman_bool_t srcRepeat,
-                              pixman_bool_t maskRepeat,
                               pixman_composite_func_t compositeRect)
 {
     walk_region_internal (imp, op,
                          pSrc, pMask, pDst,
                          xSrc, ySrc, xMask, yMask, xDst, yDst,
-                         width, height,
-                         srcRepeat, maskRepeat,
+                         width, height, FALSE, FALSE,
                          compositeRect);
 }
 
@@ -807,13 +804,13 @@ _pixman_run_fast_path (const FastPathInfo *paths,
 
     if (func)
     {
-       _pixman_walk_composite_region (imp, op,
-                                      src, mask, dest,
-                                      src_x, src_y, mask_x, mask_y,
-                                      dest_x, dest_y,
-                                      width, height,
-                                      src_repeat, mask_repeat,
-                                      func);
+       walk_region_internal (imp, op,
+                             src, mask, dest,
+                             src_x, src_y, mask_x, mask_y,
+                             dest_x, dest_y,
+                             width, height,
+                             src_repeat, mask_repeat,
+                             func);
        return TRUE;
     }