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

* grub-core/video/fb/fbblit.c: Use (255 ^ x) rather than (255 - x).

Browse source 
Use unsigned divisions rather than signed variants.
This commit is contained in:
Vladimir Serbinenko 2013-10-25 21:35:44 +02:00
parent f690f8b030
commit d43c64899d
2 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-10-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/video/fb/fbblit.c: Use (255 ^ x) rather than (255 - x).
Use unsigned divisions rather than signed variants.
2013-10-25 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-25 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/video/readers/png.c (grub_png_convert_image): Use * grub-core/video/readers/png.c (grub_png_convert_image): Use

54
grub-core/video/fb/fbblit.c
View file

@ -1191,11 +1191,11 @@ grub_video_fbblit_blend (struct grub_video_fbblit_info *dst,
&dst_green, &dst_blue, &dst_alpha); &dst_green, &dst_blue, &dst_alpha);
dst_red = (((src_red * src_alpha) dst_red = (((src_red * src_alpha)
+ (dst_red * (255 - src_alpha))) / 255); + (dst_red * (255 ^ src_alpha))) / 255U);
dst_green = (((src_green * src_alpha) dst_green = (((src_green * src_alpha)
+ (dst_green * (255 - src_alpha))) / 255); + (dst_green * (255 ^ src_alpha))) / 255U);
dst_blue = (((src_blue * src_alpha) dst_blue = (((src_blue * src_alpha)
+ (dst_blue * (255 - src_alpha))) / 255); + (dst_blue * (255 ^ src_alpha))) / 255U);
dst_alpha = src_alpha; dst_alpha = src_alpha;
dst_color = grub_video_fb_map_rgba (dst_red, dst_green, dst_blue, dst_color = grub_video_fb_map_rgba (dst_red, dst_green, dst_blue,
@ -1270,11 +1270,11 @@ grub_video_fbblit_blend_BGRA8888_RGBA8888 (struct grub_video_fbblit_info *dst,
color = *dstptr; color = *dstptr;
dr = (color >> 16) & 0xFF; dr = (color >> 16) & 0xFF;
dr = (dr * (255 - a) + sr * a) / 255; dr = (dr * (255 ^ a) + sr * a) / 255U;
dg = (color >> 8) & 0xFF; dg = (color >> 8) & 0xFF;
dg = (dg * (255 - a) + sg * a) / 255; dg = (dg * (255 ^ a) + sg * a) / 255U;
db = (color >> 0) & 0xFF; db = (color >> 0) & 0xFF;
db = (db * (255 - a) + sb * a) / 255; db = (db * (255 ^ a) + sb * a) / 255U;
} }
color = (a << 24) | (dr << 16) | (dg << 8) | db; color = (a << 24) | (dr << 16) | (dg << 8) | db;
@ -1360,9 +1360,9 @@ grub_video_fbblit_blend_BGR888_RGBA8888 (struct grub_video_fbblit_info *dst,
db = dstptr[2]; db = dstptr[2];
#endif #endif
db = (db * (255 - a) + sb * a) / 255; db = (db * (255 ^ a) + sb * a) / 255U;
dg = (dg * (255 - a) + sg * a) / 255; dg = (dg * (255 ^ a) + sg * a) / 255U;
dr = (dr * (255 - a) + sr * a) / 255; dr = (dr * (255 ^ a) + sr * a) / 255U;
} }
#ifndef GRUB_CPU_WORDS_BIGENDIAN #ifndef GRUB_CPU_WORDS_BIGENDIAN
@ -1440,9 +1440,9 @@ grub_video_fbblit_blend_RGBA8888_RGBA8888 (struct grub_video_fbblit_info *dst,
dg = (color >> 8) & 0xFF; dg = (color >> 8) & 0xFF;
db = (color >> 16) & 0xFF; db = (color >> 16) & 0xFF;
dr = (dr * (255 - a) + sr * a) / 255; dr = (dr * (255 ^ a) + sr * a) / 255U;
dg = (dg * (255 - a) + sg * a) / 255; dg = (dg * (255 ^ a) + sg * a) / 255U;
db = (db * (255 - a) + sb * a) / 255; db = (db * (255 ^ a) + sb * a) / 255U;
color = (a << 24) | (db << 16) | (dg << 8) | dr; color = (a << 24) | (db << 16) | (dg << 8) | dr;
@ -1525,9 +1525,9 @@ grub_video_fbblit_blend_RGB888_RGBA8888 (struct grub_video_fbblit_info *dst,
dr = dstptr[2]; dr = dstptr[2];
#endif #endif
dr = (dr * (255 - a) + sr * a) / 255; dr = (dr * (255 ^ a) + sr * a) / 255U;
dg = (dg * (255 - a) + sg * a) / 255; dg = (dg * (255 ^ a) + sg * a) / 255U;
db = (db * (255 - a) + sb * a) / 255; db = (db * (255 ^ a) + sb * a) / 255U;
#ifndef GRUB_CPU_WORDS_BIGENDIAN #ifndef GRUB_CPU_WORDS_BIGENDIAN
*dstptr++ = dr; *dstptr++ = dr;
@ -1601,9 +1601,9 @@ grub_video_fbblit_blend_index_RGBA8888 (struct grub_video_fbblit_info *dst,
grub_video_fb_unmap_color_int (dst, *dstptr, &dr, &dg, &db, &da); grub_video_fb_unmap_color_int (dst, *dstptr, &dr, &dg, &db, &da);
dr = (dr * (255 - a) + sr * a) / 255; dr = (dr * (255 ^ a) + sr * a) / 255U;
dg = (dg * (255 - a) + sg * a) / 255; dg = (dg * (255 ^ a) + sg * a) / 255U;
db = (db * (255 - a) + sb * a) / 255; db = (db * (255 ^ a) + sb * a) / 255U;
color = grub_video_fb_map_rgb(dr, dg, db); color = grub_video_fb_map_rgb(dr, dg, db);
@ -1683,9 +1683,9 @@ grub_video_fbblit_blend_XXXA8888_1bit (struct grub_video_fbblit_info *dst,
grub_uint8_t d2 = (*dstptr >> 8) & 0xFF; grub_uint8_t d2 = (*dstptr >> 8) & 0xFF;
grub_uint8_t d3 = (*dstptr >> 16) & 0xFF; grub_uint8_t d3 = (*dstptr >> 16) & 0xFF;
d1 = (d1 * (255 - a) + s1 * a) / 255; d1 = (d1 * (255 ^ a) + s1 * a) / 255U;
d2 = (d2 * (255 - a) + s2 * a) / 255; d2 = (d2 * (255 ^ a) + s2 * a) / 255U;
d3 = (d3 * (255 - a) + s3 * a) / 255; d3 = (d3 * (255 ^ a) + s3 * a) / 255U;
*dstptr = (a << 24) | (d3 << 16) | (d2 << 8) | d1; *dstptr = (a << 24) | (d3 << 16) | (d2 << 8) | d1;
} }
@ -1791,9 +1791,9 @@ grub_video_fbblit_blend_XXX888_1bit (struct grub_video_fbblit_info *dst,
grub_uint8_t d2 = (*(grub_uint32_t *) dstptr >> 8) & 0xFF; grub_uint8_t d2 = (*(grub_uint32_t *) dstptr >> 8) & 0xFF;
grub_uint8_t d3 = (*(grub_uint32_t *) dstptr >> 16) & 0xFF; grub_uint8_t d3 = (*(grub_uint32_t *) dstptr >> 16) & 0xFF;
((grub_uint8_t *) dstptr)[0] = (d1 * (255 - a) + s1 * a) / 255; ((grub_uint8_t *) dstptr)[0] = (d1 * (255 ^ a) + s1 * a) / 255U;
((grub_uint8_t *) dstptr)[1] = (d2 * (255 - a) + s2 * a) / 255; ((grub_uint8_t *) dstptr)[1] = (d2 * (255 ^ a) + s2 * a) / 255U;
((grub_uint8_t *) dstptr)[2] = (d3 * (255 - a) + s3 * a) / 255; ((grub_uint8_t *) dstptr)[2] = (d3 * (255 ^ a) + s3 * a) / 255U;
} }
srcmask >>= 1; srcmask >>= 1;
@ -1887,9 +1887,9 @@ grub_video_fbblit_blend_XXX565_1bit (struct grub_video_fbblit_info *dst,
grub_uint8_t d2 = (*dstptr >> 5) & 0x3F; grub_uint8_t d2 = (*dstptr >> 5) & 0x3F;
grub_uint8_t d3 = (*dstptr >> 11) & 0x1F; grub_uint8_t d3 = (*dstptr >> 11) & 0x1F;
d1 = (d1 * (255 - a) + s1 * a) / 255; d1 = (d1 * (255 ^ a) + s1 * a) / 255U;
d2 = (d2 * (255 - a) + s2 * a) / 255; d2 = (d2 * (255 ^ a) + s2 * a) / 255U;
d3 = (d3 * (255 - a) + s3 * a) / 255; d3 = (d3 * (255 ^ a) + s3 * a) / 255U;
*dstptr = (d1 & 0x1f) | ((d2 & 0x3f) << 5) | ((d3 & 0x1f) << 11); *dstptr = (d1 & 0x1f) | ((d2 & 0x3f) << 5) | ((d3 & 0x1f) << 11);
} }