Add store_scanline_raw_{32,64} virtual functions to bits image

diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c
index c9b8d24..e0b818c 100644 (file)
--- a/pixman/pixman-bits-image.c
+++ b/pixman/pixman-bits-image.c
@@ -266,8 +266,8 @@ fbStoreExternalAlpha64 (bits_image_t * image, int x, int y, int width,
     const pixman_indexed_t * indexed = image->indexed;
     const pixman_indexed_t * aindexed;
 
-    store = ACCESS(pixman_storeProcForPicture64)(image);
-    astore = ACCESS(pixman_storeProcForPicture64)(image->common.alpha_map);
+    store = WRITE_ACCESS(pixman_storeProcForPicture64)(image);
+    astore = WRITE_ACCESS(pixman_storeProcForPicture64)(image->common.alpha_map);
     aindexed = image->common.alpha_map->indexed;
 
     ax = x;
@@ -791,8 +791,6 @@ bits_image_property_changed (pixman_image_t *image)
            (scanFetchProc)fbFetchTransformed;
     }
     
-    bits->fetch_pixel = READ_ACCESS(pixman_fetchPixelProcForPicture32)(bits);
-    
     if (bits->common.alpha_map)
     {
        bits->store_scanline_64 = (scanStoreProc)fbStoreExternalAlpha64;
@@ -803,6 +801,13 @@ bits_image_property_changed (pixman_image_t *image)
        bits->store_scanline_64 = (scanStoreProc)fbStore64;
        bits->store_scanline_32 = fbStore;
     }
+
+    bits->store_scanline_raw_32 =
+       WRITE_ACCESS(pixman_storeProcForPicture32)(bits);
+    bits->store_scanline_raw_64 =
+       WRITE_ACCESS(pixman_storeProcForPicture64)(bits);
+    
+    bits->fetch_pixel = READ_ACCESS(pixman_fetchPixelProcForPicture32)(bits);
 }
 
 void

diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h
index 407727d..987b109 100644 (file)
--- a/pixman/pixman-private.h
+++ b/pixman/pixman-private.h
@@ -383,6 +383,9 @@ struct bits_image
     
     scanStoreProc              store_scanline_32;
     scanStoreProc              store_scanline_64;
+
+    storeProc32                        store_scanline_raw_32;
+    storeProc64                        store_scanline_raw_64;
 };
 
 union pixman_image