Eliminate _pixman_image_get/store_scanline()

These are superseded by _pixman_iterator_get/store_scanline().

2 files changed, 12 insertions, 67 deletions

diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c
index 08645666..06510471 100644
--- a/pixman/pixman-image.c
+++ b/pixman/pixman-image.c
@@ -82,7 +82,7 @@ _pixman_image_get_scanline_generic_64 (pixman_image_t * image,
     }
 
     /* Fetch the source image into the first half of buffer. */
-    _pixman_image_get_scanline_32 (image, x, y, width, (uint32_t*)buffer, mask8);
+    image->common.get_scanline_32 (image, x, y, width, (uint32_t*)buffer, mask8);
 
     /* Expand from 32bpp to 64bpp in place. */
     pixman_expand ((uint64_t *)buffer, buffer, PIXMAN_a8r8g8b8, width);
@@ -135,31 +135,6 @@ _pixman_image_classify (pixman_image_t *image,
 	return SOURCE_IMAGE_CLASS_UNKNOWN;
 }
 
-void
-_pixman_image_get_scanline_32 (pixman_image_t *image,
-                               int             x,
-                               int             y,
-                               int             width,
-                               uint32_t *      buffer,
-                               const uint32_t *mask)
-{
-    image->common.get_scanline_32 (image, x, y, width, buffer, mask);
-}
-
-/* Even thought the type of buffer is uint32_t *, the function actually expects
- * a uint64_t *buffer.
- */
-void
-_pixman_image_get_scanline_64 (pixman_image_t *image,
-                               int             x,
-                               int             y,
-                               int             width,
-                               uint32_t *      buffer,
-                               const uint32_t *unused)
-{
-    image->common.get_scanline_64 (image, x, y, width, buffer, unused);
-}
-
 static void
 image_property_changed (pixman_image_t *image)
 {
@@ -805,7 +780,7 @@ _pixman_image_get_solid (pixman_image_t *     image,
 {
     uint32_t result;
 
-    _pixman_image_get_scanline_32 (image, 0, 0, 1, &result, NULL);
+    image->common.get_scanline_32 (image, 0, 0, 1, &result, NULL);
 
     /* If necessary, convert RGB <--> BGR. */
     if (PIXMAN_FORMAT_TYPE (format) != PIXMAN_TYPE_ARGB)
@@ -851,7 +826,7 @@ _pixman_iterator_get_scanline_32 (iterator_t     *iter,
 				  uint32_t       *buffer,
 				  const uint32_t *mask)
 {
-    _pixman_image_get_scanline_32 (
+    iter->image->common.get_scanline_32 (
 	iter->image, iter->x, iter->y, iter->width, buffer, mask);
 }
 
@@ -859,7 +834,7 @@ void
 _pixman_iterator_store_scanline_32 (iterator_t   *iter,
 				    uint32_t     *buffer)
 {
-    _pixman_image_store_scanline_32 (
+    iter->image->bits.store_scanline_32 (
 	&(iter->image->bits), iter->x, iter->y, iter->width, buffer);
 }
 
@@ -868,7 +843,7 @@ _pixman_iterator_get_scanline_64 (iterator_t *iter,
 				  uint32_t   *buffer,
 				  const uint32_t *mask)
 {
-    _pixman_image_get_scanline_64 (
+    iter->image->common.get_scanline_64 (
 	iter->image, iter->x, iter->y, iter->width, buffer, mask);
 }
 
@@ -876,7 +851,7 @@ void
 _pixman_iterator_store_scanline_64 (iterator_t   *iter,
 				    uint32_t     *buffer)
 {
-    _pixman_image_store_scanline_64 (
+    iter->image->bits.store_scanline_64 (
 	&(iter->image->bits), iter->x, iter->y, iter->width, buffer);
 }
 
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 2d1db231..6b8d570e 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -220,42 +220,6 @@ _pixman_image_classify (pixman_image_t *image,
                         int             width,
                         int             height);
 
-void
-_pixman_image_get_scanline_32 (pixman_image_t *image,
-                               int             x,
-                               int             y,
-                               int             width,
-                               uint32_t *      buffer,
-                               const uint32_t *mask);
-
-/* Even thought the type of buffer is uint32_t *, the function actually expects
- * a uint64_t *buffer.
- */
-void
-_pixman_image_get_scanline_64 (pixman_image_t *image,
-                               int             x,
-                               int             y,
-                               int             width,
-                               uint32_t *      buffer,
-                               const uint32_t *unused);
-
-void
-_pixman_image_store_scanline_32 (bits_image_t *  image,
-                                 int             x,
-                                 int             y,
-                                 int             width,
-                                 const uint32_t *buffer);
-
-/* Even though the type of buffer is uint32_t *, the function
- * actually expects a uint64_t *buffer.
- */
-void
-_pixman_image_store_scanline_64 (bits_image_t *  image,
-                                 int             x,
-                                 int             y,
-                                 int             width,
-                                 const uint32_t *buffer);
-
 pixman_image_t *
 _pixman_image_allocate (void);
 
@@ -308,11 +272,17 @@ void
 _pixman_iterator_store_scanline_32 (iterator_t   *iter,
 				    uint32_t     *buffer);
 
+/* Even thought the type of buffer is uint32_t *, the function actually expects
+ * a uint64_t *buffer.
+ */
 void
 _pixman_iterator_get_scanline_64 (iterator_t *image,
 				  uint32_t   *buffer,
 				  const uint32_t *mask);
 
+/* Even though the type of buffer is uint32_t *, the function
+ * actually expects a uint64_t *buffer.
+ */
 void
 _pixman_iterator_store_scanline_64 (iterator_t   *iter,
 				    uint32_t     *buffer);