[cairo-commit] 2 commits - src/cairo-image-compositor.c src/cairo-path-fixed-private.h

[Chris Wilson]

 src/cairo-image-compositor.c   |    4 ++--
 src/cairo-path-fixed-private.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1ba9fb6fadcc1cb619af0ef974dffb0ff8672244
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Jan 27 16:15:35 2013 +0000

    Mark _cairo_path_is_simple_quad as private
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-path-fixed-private.h b/src/cairo-path-fixed-private.h
index 05904ad..cf7cd08 100644
--- a/src/cairo-path-fixed-private.h
+++ b/src/cairo-path-fixed-private.h
@@ -200,7 +200,7 @@ cairo_private cairo_bool_t
 _cairo_path_fixed_is_stroke_box (const cairo_path_fixed_t *path,
 				 cairo_box_t *box);
 
-cairo_bool_t
+cairo_private cairo_bool_t
 _cairo_path_fixed_is_simple_quad (const cairo_path_fixed_t *path);
 
 #endif /* CAIRO_PATH_FIXED_PRIVATE_H */
commit 1d105f215a9c62f5b60541da209bf71182a2e9df
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Jan 27 16:29:44 2013 +0000

    image: Fix opaque span fills
    
    I should have realised the previous result was too good to be true!
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c
index 7e905ce..51b4ce3 100644
--- a/src/cairo-image-compositor.c
+++ b/src/cairo-image-compositor.c
@@ -2188,7 +2188,7 @@ _fill_xrgb32_lerp_opaque_spans (void *abstract_renderer, int y, int h,
 		uint32_t *d = (uint32_t*)(r->u.fill.data + r->u.fill.stride*y + spans[0].x*4);
 		if (a == 0xff) {
 		    if (len > 31) {
-			pixman_fill ((uint32_t *)r->u.fill.data, r->u.fill.stride / sizeof(uint32_t), r->bpp,
+			pixman_fill ((uint32_t *)r->u.fill.data, r->u.fill.stride / sizeof(uint32_t), 32,
 				     spans[0].x, y, len, 1, r->u.fill.pixel);
 		    } else {
 			uint32_t *d = (uint32_t*)(r->u.fill.data + r->u.fill.stride*y + spans[0].x*4);
@@ -2208,7 +2208,7 @@ _fill_xrgb32_lerp_opaque_spans (void *abstract_renderer, int y, int h,
 	    if (a) {
 		if (a == 0xff) {
 		    if (spans[1].x - spans[0].x > 16) {
-			pixman_fill ((uint32_t *)r->u.fill.data, r->u.fill.stride / sizeof(uint32_t), r->bpp,
+			pixman_fill ((uint32_t *)r->u.fill.data, r->u.fill.stride / sizeof(uint32_t), 32,
 				     spans[0].x, y, spans[1].x - spans[0].x, h,
 				     r->u.fill.pixel);
 		    } else {