remove useless code

4 files changed, 3 insertions, 93 deletions

diff --git a/pixman/pixman-access.c b/pixman/pixman-access.c
index 068d952..95a6a47 100644
--- a/pixman/pixman-access.c
+++ b/pixman/pixman-access.c
@@ -307,6 +307,7 @@ MAKE_FETCHERS(g1);
 
 /********************************** Fetch ************************************/
 
+#if 0
 /* Expects a uint64_t buffer */
 static void
 fetch_scanline_a2r10g10b10 (pixman_image_t *image,
@@ -712,6 +713,8 @@ fetch_scanline_generic_lossy_32 (pixman_image_t *image,
     }
 }
 
+#endif
+
 typedef struct
 {
     pixman_format_code_t	format;
diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c
index e150a08..a286497 100644
--- a/pixman/pixman-bits-image.c
+++ b/pixman/pixman-bits-image.c
@@ -36,45 +36,6 @@
 #include "pixman-private.h"
 #include "pixman-combine32.h"
 
-/* Store functions */
-void
-_pixman_image_store_scanline_32 (bits_image_t *  image,
-                                 int             x,
-                                 int             y,
-                                 int             width,
-                                 const uint32_t *buffer)
-{
-    image->store_scanline_32 (image, x, y, width, buffer);
-
-    if (image->common.alpha_map)
-    {
-	x -= image->common.alpha_origin_x;
-	y -= image->common.alpha_origin_y;
-
-	image->common.alpha_map->store_scanline_32 (
-	    image->common.alpha_map, x, y, width, buffer);
-    }
-}
-
-void
-_pixman_image_store_scanline_64 (bits_image_t *  image,
-                                 int             x,
-                                 int             y,
-                                 int             width,
-                                 const uint32_t *buffer)
-{
-    image->store_scanline_64 (image, x, y, width, buffer);
-
-    if (image->common.alpha_map)
-    {
-	x -= image->common.alpha_origin_x;
-	y -= image->common.alpha_origin_y;
-
-	image->common.alpha_map->store_scanline_64 (
-	    image->common.alpha_map, x, y, width, buffer);
-    }
-}
-
 /* Fetch functions */
 
 static force_inline void
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index b62dba1..7e03043 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -34,19 +34,6 @@ typedef struct circle circle_t;
 
 typedef float pixman_component_t;
 
-typedef void (*fetch_scanline_t) (pixman_image_t *image,
-				  int             x,
-				  int             y,
-				  int             width,
-				  uint32_t       *buffer,
-				  const uint32_t *mask);
-
-typedef void (*store_scanline_t) (bits_image_t *  image,
-				  int             x,
-				  int             y,
-				  int             width,
-				  const uint32_t *values);
-
 typedef void (*fetch_scanline_new_t) (pixman_image_t *image,
 				  int             x,
 				  int             y,
@@ -106,8 +93,6 @@ struct image_common
     pixman_bool_t               component_alpha;
     classify_func_t             classify;
     property_changed_func_t     property_changed;
-    //fetch_scanline_t            get_scanline_32;
-    //fetch_scanline_t            get_scanline_64;
     fetch_scanline_new_t	get_scanline;
 
     pixman_image_destroy_func_t destroy_func;
@@ -178,12 +163,6 @@ struct bits_image
     uint32_t *                 free_me;
     int                        rowstride;  /* in number of uint32_t's */
 
-    fetch_scanline_t           fetch_scanline_32;
-    store_scanline_t           store_scanline_32;
-
-    fetch_scanline_t           fetch_scanline_64;
-    store_scanline_t           store_scanline_64;
-
     fetch_scanline_new_t       fetch_scanline;
     store_scanline_new_t       store_scanline;
 
diff --git a/pixman/pixman-solid-fill.c b/pixman/pixman-solid-fill.c
index d54e515..913a751 100644
--- a/pixman/pixman-solid-fill.c
+++ b/pixman/pixman-solid-fill.c
@@ -48,39 +48,6 @@ solid_fill_get_scanline (pixman_image_t *image,
     }
 }
 
-static void
-solid_fill_get_scanline_32 (pixman_image_t *image,
-                            int             x,
-                            int             y,
-                            int             width,
-                            uint32_t *      buffer,
-                            const uint32_t *mask)
-{
-    uint32_t *end = buffer + width;
-    uint32_t color = image->solid.color_32;
-
-    while (buffer < end)
-	*(buffer++) = color;
-
-    return;
-}
-
-static void
-solid_fill_get_scanline_64 (pixman_image_t *image,
-			    int             x,
-			    int             y,
-			    int             width,
-			    uint32_t *      buffer,
-			    const uint32_t *mask)
-{
-    uint64_t *b = (uint64_t *)buffer;
-    uint64_t *e = b + width;
-    uint64_t color = image->solid.color_64;
-
-    while (b < e)
-	*(b++) = color;
-}
-
 static source_image_class_t
 solid_fill_classify (pixman_image_t *image,
                      int             x,