fixed

1 files changed, 7 insertions, 45 deletions

diff --git a/pixman/pixman-general.c b/pixman/pixman-general.c
index 562a949..9bf4965 100644
--- a/pixman/pixman-general.c
+++ b/pixman/pixman-general.c
@@ -103,48 +103,19 @@ general_composite_rect  (pixman_implementation_t *imp,
 
     if (op == PIXMAN_OP_CLEAR)
 	fetch_src = NULL;
-    else if (narrow)
-	fetch_src = _pixman_image_get_scanline_32;
     else
-	fetch_src = _pixman_image_get_scanline_64;
+	fetch_src = _pixman_image_get_scanline;
 
     if (!mask || op == PIXMAN_OP_CLEAR)
 	fetch_mask = NULL;
-    else if (narrow)
-	fetch_mask = _pixman_image_get_scanline_32;
     else
-	fetch_mask = _pixman_image_get_scanline_64;
+	fetch_mask = _pixman_image_get_scanline;
 
-    if (op == PIXMAN_OP_CLEAR || op == PIXMAN_OP_SRC)
-	fetch_dest = NULL;
-    else if (narrow)
-	fetch_dest = _pixman_image_get_scanline_32;
-    else
-	fetch_dest = _pixman_image_get_scanline_64;
-
-    if (narrow)
-	store = _pixman_image_store_scanline_32;
-    else
-	store = _pixman_image_store_scanline_64;
-
-    if (fetch_src)
-      fetch_src = _pixman_image_get_scanline;
-    if (fetch_mask)
-      fetch_mask = _pixman_image_get_scanline;
     fetch_dest = _pixman_image_get_scanline;
-    if (store)
-      store = _pixman_image_store_scanline;
+    store = _pixman_image_store_scanline;
 
-    if (!store)
-    {
-	bits = dest->bits.bits;
-	stride = dest->bits.rowstride;
-    }
-    else
-    {
-	bits = NULL;
-	stride = 0;
-    }
+    bits = NULL;
+    stride = 0;
 
     component_alpha =
         fetch_src                       &&
@@ -155,15 +126,9 @@ general_composite_rect  (pixman_implementation_t *imp,
         PIXMAN_FORMAT_RGB (mask->bits.format);
 
     if (component_alpha)
-      compose = _pixman_implementation_combine_ca;
+	compose = _pixman_implementation_combine_ca;
     else
-      compose = _pixman_implementation_combine;
-
-    if (!compose)
-	return;
-
-    assert (store);
-    assert (fetch_dest);
+	compose = _pixman_implementation_combine;
 
     if (!fetch_mask)
 	mask_buffer = NULL;
@@ -224,13 +189,10 @@ general_composite_rect  (pixman_implementation_t *imp,
 	}
 	else
 	{
-	  assert (0);
-#if 0
 	    /* blend */
 	    compose (imp->toplevel, op,
 		     bits + (dest_y + i) * stride + dest_x,
 	             (void *)src_buffer, (void *)mask_buffer, width);
-#endif
 	}
     }