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

	Use unsigned divisions rather than signed variants.

diff --git a/ChangeLog b/ChangeLog
index 3f46d2aaf41bd509781e6d7b8197e2b8053bfcef..b3f289ef9916da7dfcf40c87020acff151635547 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * grub-core/video/readers/png.c (grub_png_convert_image): Use

diff --git a/grub-core/video/fb/fbblit.c b/grub-core/video/fb/fbblit.c
index 972976e5c819814931d7cefa4607ebc79e6f7a30..3a073cea7611d74bcfd44192c4f4cd7672b7846e 100644 (file)
--- a/grub-core/video/fb/fbblit.c
+++ b/grub-core/video/fb/fbblit.c
@@ -1191,11 +1191,11 @@ grub_video_fbblit_blend (struct grub_video_fbblit_info *dst,
                                         &dst_green, &dst_blue, &dst_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 * (255 - src_alpha))) / 255);
+                        + (dst_green * (255 ^ src_alpha))) / 255U);
           dst_blue = (((src_blue * src_alpha)
-                       + (dst_blue * (255 - src_alpha))) / 255);
+                       + (dst_blue * (255 ^ src_alpha))) / 255U);
 
           dst_alpha = src_alpha;
           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;
 
               dr = (color >> 16) & 0xFF;
-              dr = (dr * (255 - a) + sr * a) / 255;
+              dr = (dr * (255 ^ a) + sr * a) / 255U;
               dg = (color >> 8) & 0xFF;
-              dg = (dg * (255 - a) + sg * a) / 255;
+              dg = (dg * (255 ^ a) + sg * a) / 255U;
               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;
@@ -1360,9 +1360,9 @@ grub_video_fbblit_blend_BGR888_RGBA8888 (struct grub_video_fbblit_info *dst,
               db = dstptr[2];
 #endif
 
-              db = (db * (255 - a) + sb * a) / 255;
-              dg = (dg * (255 - a) + sg * a) / 255;
-              dr = (dr * (255 - a) + sr * a) / 255;
+              db = (db * (255 ^ a) + sb * a) / 255U;
+              dg = (dg * (255 ^ a) + sg * a) / 255U;
+              dr = (dr * (255 ^ a) + sr * a) / 255U;
             }
 
 #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;
           db = (color >> 16) & 0xFF;
 
-          dr = (dr * (255 - a) + sr * a) / 255;
-          dg = (dg * (255 - a) + sg * a) / 255;
-          db = (db * (255 - a) + sb * a) / 255;
+          dr = (dr * (255 ^ a) + sr * a) / 255U;
+          dg = (dg * (255 ^ a) + sg * a) / 255U;
+          db = (db * (255 ^ a) + sb * a) / 255U;
 
           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];
 #endif
 
-          dr = (dr * (255 - a) + sr * a) / 255;
-          dg = (dg * (255 - a) + sg * a) / 255;
-          db = (db * (255 - a) + sb * a) / 255;
+          dr = (dr * (255 ^ a) + sr * a) / 255U;
+          dg = (dg * (255 ^ a) + sg * a) / 255U;
+          db = (db * (255 ^ a) + sb * a) / 255U;
 
 #ifndef GRUB_CPU_WORDS_BIGENDIAN
           *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);
 
-          dr = (dr * (255 - a) + sr * a) / 255;
-          dg = (dg * (255 - a) + sg * a) / 255;
-          db = (db * (255 - a) + sb * a) / 255;
+          dr = (dr * (255 ^ a) + sr * a) / 255U;
+          dg = (dg * (255 ^ a) + sg * a) / 255U;
+          db = (db * (255 ^ a) + sb * a) / 255U;
 
           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 d3 = (*dstptr >> 16) & 0xFF;
 
-             d1 = (d1 * (255 - a) + s1 * a) / 255;
-             d2 = (d2 * (255 - a) + s2 * a) / 255;
-             d3 = (d3 * (255 - a) + s3 * a) / 255;
+             d1 = (d1 * (255 ^ a) + s1 * a) / 255U;
+             d2 = (d2 * (255 ^ a) + s2 * a) / 255U;
+             d3 = (d3 * (255 ^ a) + s3 * a) / 255U;
 
              *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 d3 = (*(grub_uint32_t *) dstptr >> 16) & 0xFF;
 
-             ((grub_uint8_t *) dstptr)[0] = (d1 * (255 - a) + s1 * a) / 255;
-             ((grub_uint8_t *) dstptr)[1] = (d2 * (255 - a) + s2 * a) / 255;
-             ((grub_uint8_t *) dstptr)[2] = (d3 * (255 - a) + s3 * a) / 255;
+             ((grub_uint8_t *) dstptr)[0] = (d1 * (255 ^ a) + s1 * a) / 255U;
+             ((grub_uint8_t *) dstptr)[1] = (d2 * (255 ^ a) + s2 * a) / 255U;
+             ((grub_uint8_t *) dstptr)[2] = (d3 * (255 ^ a) + s3 * a) / 255U;
            }
 
          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 d3 = (*dstptr >> 11) & 0x1F;
 
-             d1 = (d1 * (255 - a) + s1 * a) / 255;
-             d2 = (d2 * (255 - a) + s2 * a) / 255;
-             d3 = (d3 * (255 - a) + s3 * a) / 255;
+             d1 = (d1 * (255 ^ a) + s1 * a) / 255U;
+             d2 = (d2 * (255 ^ a) + s2 * a) / 255U;
+             d3 = (d3 * (255 ^ a) + s3 * a) / 255U;
 
              *dstptr = (d1 & 0x1f) | ((d2 & 0x3f) << 5) | ((d3 & 0x1f) << 11);
            }