Rename pixmanFetchSourcePict to pixmanFetchGradient

Move the solid fill parts into pixman-solid-fill.c

diff --git a/pixman/pixman-conical-gradient.c b/pixman/pixman-conical-gradient.c
index d5c4e23..974fd7c 100644 (file)
--- a/pixman/pixman-conical-gradient.c
+++ b/pixman/pixman-conical-gradient.c
@@ -27,7 +27,7 @@
 static void
 conical_gradient_property_changed (pixman_image_t *image)
 {
-    image->common.get_scanline_32 = (scanFetchProc)pixmanFetchSourcePict;
+    image->common.get_scanline_32 = (scanFetchProc)pixmanFetchGradient;
     image->common.get_scanline_64 = (scanFetchProc)_pixman_image_get_scanline_64_generic;
 }
 

diff --git a/pixman/pixman-linear-gradient.c b/pixman/pixman-linear-gradient.c
index c6c662a..b18c2cf 100644 (file)
--- a/pixman/pixman-linear-gradient.c
+++ b/pixman/pixman-linear-gradient.c
@@ -86,7 +86,7 @@ linear_gradient_classify (pixman_image_t *image,
 static void
 linear_gradient_property_changed (pixman_image_t *image)
 {
-    image->common.get_scanline_32 = (scanFetchProc)pixmanFetchSourcePict;
+    image->common.get_scanline_32 = (scanFetchProc)pixmanFetchGradient;
     image->common.get_scanline_64 = (scanFetchProc)_pixman_image_get_scanline_64_generic;
 }
 

diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index ff1bfa6..a983da8 100644 (file)
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -220,7 +220,7 @@ storeProc64 pixman_storeProcForPicture64_accessors (bits_image_t *);
 void pixman_expand(uint64_t *dst, const uint32_t *src, pixman_format_code_t, int width);
 void pixman_contract(uint32_t *dst, const uint64_t *src, int width);
 
-void pixmanFetchSourcePict(source_image_t *, int x, int y, int width,
+void pixmanFetchGradient (gradient_t *, int x, int y, int width,
                            uint32_t *buffer, uint32_t *mask, uint32_t maskBits);
 void _pixman_image_get_scanline_64_generic (pixman_image_t * pict, int x, int y, int width,
                                            uint64_t *buffer, uint64_t *mask, uint32_t maskBits);

diff --git a/pixman/pixman-radial-gradient.c b/pixman/pixman-radial-gradient.c
index e05299c..40c76ce 100644 (file)
--- a/pixman/pixman-radial-gradient.c
+++ b/pixman/pixman-radial-gradient.c
@@ -27,7 +27,7 @@
 static void
 radial_gradient_property_changed (pixman_image_t *image)
 {
-    image->common.get_scanline_32 = (scanFetchProc)pixmanFetchSourcePict;
+    image->common.get_scanline_32 = (scanFetchProc)pixmanFetchGradient;
     image->common.get_scanline_64 = (scanFetchProc)_pixman_image_get_scanline_64_generic;
 }
 

diff --git a/pixman/pixman-solid-fill.c b/pixman/pixman-solid-fill.c
index af383b5..1805600 100644 (file)
--- a/pixman/pixman-solid-fill.c
+++ b/pixman/pixman-solid-fill.c
@@ -24,6 +24,19 @@
 #include <config.h>
 #include "pixman-private.h"
 
+static void
+solid_fill_get_scanline_32 (pixman_image_t *image, int x, int y, int width,
+                           uint32_t *buffer, uint32_t *mask, uint32_t maskBits)
+{
+    uint32_t *end = buffer + width;
+    register uint32_t color = ((solid_fill_t *)image)->color;
+    
+    while (buffer < end)
+       *(buffer++) = color;
+    
+    return;
+}
+
 static source_pict_class_t
 solid_fill_classify (pixman_image_t *image,
                     int             x,
@@ -37,7 +50,7 @@ solid_fill_classify (pixman_image_t *image,
 static void
 solid_fill_property_changed (pixman_image_t *image)
 {
-    image->common.get_scanline_32 = (scanFetchProc)pixmanFetchSourcePict;
+    image->common.get_scanline_32 = (scanFetchProc)solid_fill_get_scanline_32;
     image->common.get_scanline_64 = (scanFetchProc)_pixman_image_get_scanline_64_generic;
 }
 

diff --git a/pixman/pixman-source.c b/pixman/pixman-source.c
index 0b2569e..ba0ba67 100644 (file)
--- a/pixman/pixman-source.c
+++ b/pixman/pixman-source.c
@@ -32,27 +32,15 @@
 
 #include "pixman-private.h"
 
-void pixmanFetchSourcePict(source_image_t * pict, int x, int y, int width,
-                           uint32_t *buffer, uint32_t *mask, uint32_t maskBits)
+void
+pixmanFetchGradient(gradient_t *gradient, int x, int y, int width,
+                   uint32_t *buffer, uint32_t *mask, uint32_t maskBits)
 {
-#if 0
-    SourcePictPtr   pGradient = pict->pSourcePict;
-#endif
     GradientWalker  walker;
     uint32_t       *end = buffer + width;
-    gradient_t     *gradient;
-
-    if (pict->common.type == SOLID)
-    {
-       register uint32_t color = ((solid_fill_t *)pict)->color;
-
-       while (buffer < end)
-           *(buffer++) = color;
-
-       return;
-    }
+    source_image_t *pict;
 
-    gradient = (gradient_t *)pict;
+    pict = (source_image_t *)gradient;
 
     _pixman_gradient_walker_init (&walker, gradient, pict->common.repeat);