wip

2 files changed, 19 insertions, 3 deletions

diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
index 9bf4965..a758da7 100644
--- a/pixman/pixman-general.c
+++ b/pixman/pixman-general.c
@@ -189,10 +189,13 @@ general_composite_rect  (pixman_implementation_t *imp,
 	}
 	else
 	{
+	    assert (0);
 	    /* blend */
+	    /*
 	    compose (imp->toplevel, op,
 		     bits + (dest_y + i) * stride + dest_x,
 	             (void *)src_buffer, (void *)mask_buffer, width);
+	    */
 	}
     }
 
diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 69ea020..4580cae 100644
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -47,6 +47,19 @@ typedef void (*store_scanline_t) (bits_image_t *  image,
 				  int             width,
 				  const uint32_t *values);
 
+typedef void (*fetch_scanline_new_t) (pixman_image_t *image,
+				  int             x,
+				  int             y,
+				  int             width,
+				  pixman_component_t       *buffer,
+				  const pixman_component_t *mask);
+
+typedef void (*store_scanline_new_t) (bits_image_t *  image,
+				      int             x,
+				      int             y,
+				      int             width,
+				      const pixman_component_t *values);
+
 typedef enum
 {
     BITS,
@@ -95,7 +108,7 @@ struct image_common
     property_changed_func_t     property_changed;
     fetch_scanline_t            get_scanline_32;
     fetch_scanline_t            get_scanline_64;
-    fetch_scanline_t		get_scanline;
+    fetch_scanline_new_t	get_scanline;
 
     pixman_image_destroy_func_t destroy_func;
     void *                      destroy_data;
@@ -171,8 +184,8 @@ struct bits_image
     fetch_scanline_t           fetch_scanline_64;
     store_scanline_t           store_scanline_64;
 
-    fetch_scanline_t	       fetch_scanline;
-    store_scanline_t           store_scanline;
+    fetch_scanline_new_t       fetch_scanline;
+    store_scanline_new_t       store_scanline;
 
     /* Used for indirect access to the bits */
     pixman_read_memory_func_t  read_func;