vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge mainline into bidi

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-17 00:18:30 +01:00
commit 2b68d34764
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-03-17 Vladimir Serbinenko <phcoder@gmail.com>
* video/fb/fbblit.c (grub_video_fbblit_blend_XXXA8888_1bit): Handle
alpha_mask_size == 0 case.
2010-03-14 BVK Chaitanya <bvk.groups@gmail.com>
GRUB shell lexer and parser improvements.

11
video/fb/fbblit.c
View file

@ -1170,10 +1170,15 @@ grub_video_fbblit_blend_XXXA8888_1bit (struct grub_video_fbblit_info *dst,
grub_uint8_t a;
if (*srcptr & srcmask)
color = fgcolor;
{
color = fgcolor;
a = src->mode_info->fg_alpha;
}
else
color = bgcolor;
a = (color >> 24) & 0xff;
{
color = bgcolor;
a = src->mode_info->bg_alpha;
}
if (a == 255)
*(grub_uint32_t *) dstptr = color;