From d78e30b26be15683062a1a3b76fbbe7d3b5abe0f Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Sun, 21 Jun 2009 19:06:25 -0400 Subject: [PATCH] Rename pixman_image_can_get_solid() to pixman_image_is_solid --- pixman/pixman-image.c | 23 ++++------------------- pixman/pixman-private.h | 2 +- pixman/pixman-utils.c | 4 ++-- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c index a7fd21d..ec66de5 100644 --- a/pixman/pixman-image.c +++ b/pixman/pixman-image.c @@ -508,7 +508,7 @@ pixman_image_get_depth (pixman_image_t *image) } pixman_bool_t -pixman_image_can_get_solid (pixman_image_t *image) +pixman_image_is_solid (pixman_image_t *image) { if (image->type == SOLID) return TRUE; @@ -520,25 +520,10 @@ pixman_image_can_get_solid (pixman_image_t *image) return FALSE; } - if (image->common.repeat != PIXMAN_REPEAT_NORMAL) + if (image->common.repeat == PIXMAN_REPEAT_NONE) return FALSE; - switch (image->bits.format) - { - case PIXMAN_a8r8g8b8: - case PIXMAN_x8r8g8b8: - case PIXMAN_a8b8g8r8: - case PIXMAN_x8b8g8r8: - case PIXMAN_b8g8r8a8: - case PIXMAN_b8g8r8x8: - case PIXMAN_r8g8b8: - case PIXMAN_b8g8r8: - case PIXMAN_r5g6b5: - case PIXMAN_b5g6r5: - return TRUE; - default: - return FALSE; - } + return TRUE; } uint32_t @@ -596,7 +581,7 @@ pixman_image_is_opaque (pixman_image_t *image) break; case SOLID: - if (Alpha (image->solid.color) != 0xff) + if (Alpha (image->solid.color) != 0xff) return FALSE; break; } diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h index 2f545c2..3348961 100644 --- a/pixman/pixman-private.h +++ b/pixman/pixman-private.h @@ -579,7 +579,7 @@ pixman_bool_t pixman_image_is_opaque(pixman_image_t *image); pixman_bool_t -pixman_image_can_get_solid (pixman_image_t *image); +pixman_image_is_solid (pixman_image_t *image); uint32_t pixman_image_get_solid (pixman_image_t *image, diff --git a/pixman/pixman-utils.c b/pixman/pixman-utils.c index 41eaaef..232c059 100644 --- a/pixman/pixman-utils.c +++ b/pixman/pixman-utils.c @@ -447,7 +447,7 @@ get_fast_path (const pixman_fast_path_t *fast_paths, if (info->op != op) continue; - if ((info->src_format == PIXMAN_solid && pixman_image_can_get_solid (pSrc)) || + if ((info->src_format == PIXMAN_solid && pixman_image_is_solid (pSrc)) || (pSrc->type == BITS && info->src_format == pSrc->bits.format)) { valid_src = TRUE; @@ -526,7 +526,7 @@ _pixman_run_fast_path (const pixman_fast_path_t *paths, pixman_bool_t mask_repeat = mask && mask->common.repeat == PIXMAN_REPEAT_NORMAL; pixman_bool_t result; - if ((src->type == BITS || pixman_image_can_get_solid (src)) && + if ((src->type == BITS || pixman_image_is_solid (src)) && (!mask || mask->type == BITS) && !src->common.transform && !(mask && mask->common.transform) && !(mask && mask->common.alpha_map) && !src->common.alpha_map && !dest->common.alpha_map -- 2.7.4