In pixman-general.c rename image_parameters to {src, mask, dest}_image

All the fast paths generally use these names as well.

diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
index 8db4d05..090767c 100644 (file)
--- a/pixman/pixman-general.c
+++ b/pixman/pixman-general.c
@@ -102,9 +102,9 @@ static const op_info_t op_flags[PIXMAN_N_OPERATORS] =
 static void
 general_composite_rect  (pixman_implementation_t *imp,
                          pixman_op_t              op,
-                         pixman_image_t *         src,
-                         pixman_image_t *         mask,
-                         pixman_image_t *         dest,
+                         pixman_image_t *         src_image,
+                         pixman_image_t *         mask_image,
+                         pixman_image_t *         dest_image,
                          int32_t                  src_x,
                          int32_t                  src_y,
                          int32_t                  mask_x,
@@ -124,9 +124,9 @@ general_composite_rect  (pixman_implementation_t *imp,
     int Bpp;
     int i;
 
-    if ((src->common.flags & FAST_PATH_NARROW_FORMAT)          &&
-       (!mask || mask->common.flags & FAST_PATH_NARROW_FORMAT) &&
-       (dest->common.flags & FAST_PATH_NARROW_FORMAT))
+    if ((src_image->common.flags & FAST_PATH_NARROW_FORMAT)                &&
+       (!mask_image || mask_image->common.flags & FAST_PATH_NARROW_FORMAT) &&
+       (dest_image->common.flags & FAST_PATH_NARROW_FORMAT))
     {
        narrow = ITER_NARROW;
        Bpp = 4;
@@ -152,7 +152,7 @@ general_composite_rect  (pixman_implementation_t *imp,
     /* src iter */
     src_flags = narrow | op_flags[op].src;
 
-    _pixman_implementation_src_iter_init (imp->toplevel, &src_iter, src,
+    _pixman_implementation_src_iter_init (imp->toplevel, &src_iter, src_image,
                                          src_x, src_y, width, height,
                                          src_buffer, src_flags);
 
@@ -163,24 +163,23 @@ general_composite_rect  (pixman_implementation_t *imp,
        /* If it doesn't matter what the source is, then it doesn't matter
         * what the mask is
         */
-       mask = NULL;
+       mask_image = NULL;
     }
 
     component_alpha =
-        mask                            &&
-        mask->common.type == BITS       &&
-        mask->common.component_alpha    &&
-        PIXMAN_FORMAT_RGB (mask->bits.format);
+        mask_image                           &&
+        mask_image->common.type == BITS       &&
+        mask_image->common.component_alpha    &&
+        PIXMAN_FORMAT_RGB (mask_image->bits.format);
 
     _pixman_implementation_src_iter_init (
-       imp->toplevel, &mask_iter, mask, mask_x, mask_y, width, height,
+       imp->toplevel, &mask_iter, mask_image, mask_x, mask_y, width, height,
        mask_buffer, narrow | (component_alpha? 0 : ITER_IGNORE_RGB));
 
     /* dest iter */
-    _pixman_implementation_dest_iter_init (imp->toplevel, &dest_iter, dest,
-                                          dest_x, dest_y, width, height,
-                                          dest_buffer,
-                                          narrow | op_flags[op].dst);
+    _pixman_implementation_dest_iter_init (
+       imp->toplevel, &dest_iter, dest_image, dest_x, dest_y, width, height,
+       dest_buffer, narrow | op_flags[op].dst);
 
     if (narrow)
     {