}
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;
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
break;
case SOLID:
- if (Alpha (image->solid.color) != 0xff)
+ if (Alpha (image->solid.color) != 0xff)
return FALSE;
break;
}
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,
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;
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