|
 |
31004e6 |
From c76c33ca623202ad8473fd590e934db4bfa38256 Mon Sep 17 00:00:00 2001
|
|
|
31004e6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
Date: Fri, 3 May 2013 14:07:30 +0200
|
|
|
f74b50e |
Subject: [PATCH 409/482] * grub-core/video/fb/fbblit.c
|
|
|
31004e6 |
(grub_video_fbblit_blend_BGR888_RGBA8888): Fix order bug.
|
|
|
31004e6 |
(grub_video_fbblit_blend_RGB888_RGBA8888): Likewise.
|
|
|
31004e6 |
|
|
|
31004e6 |
---
|
|
|
31004e6 |
ChangeLog | 6 ++++++
|
|
|
31004e6 |
grub-core/video/fb/fbblit.c | 19 +++++++++++++------
|
|
|
31004e6 |
2 files changed, 19 insertions(+), 6 deletions(-)
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
31004e6 |
index 9e8884a..c26b110 100644
|
|
|
31004e6 |
--- a/ChangeLog
|
|
|
31004e6 |
+++ b/ChangeLog
|
|
|
31004e6 |
@@ -1,5 +1,11 @@
|
|
|
31004e6 |
2013-05-03 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
|
|
|
31004e6 |
+ * grub-core/video/fb/fbblit.c (grub_video_fbblit_blend_BGR888_RGBA8888):
|
|
|
31004e6 |
+ Fix order bug.
|
|
|
31004e6 |
+ (grub_video_fbblit_blend_RGB888_RGBA8888): Likewise.
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+2013-05-03 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
+
|
|
|
31004e6 |
* include/grub/gui.h (grub_gfxmenu_timeout_unregister): Free cb
|
|
|
31004e6 |
descriptor.
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/grub-core/video/fb/fbblit.c b/grub-core/video/fb/fbblit.c
|
|
|
31004e6 |
index 13e2926..541a0ce 100644
|
|
|
31004e6 |
--- a/grub-core/video/fb/fbblit.c
|
|
|
31004e6 |
+++ b/grub-core/video/fb/fbblit.c
|
|
|
31004e6 |
@@ -986,11 +986,18 @@ grub_video_fbblit_blend_BGR888_RGBA8888 (struct grub_video_fbblit_info *dst,
|
|
|
31004e6 |
/* General pixel color blending. */
|
|
|
31004e6 |
color = *dstptr;
|
|
|
31004e6 |
|
|
|
31004e6 |
+#ifndef GRUB_CPU_WORDS_BIGENDIAN
|
|
|
31004e6 |
db = dstptr[0];
|
|
|
31004e6 |
- db = (db * (255 - a) + sb * a) / 255;
|
|
|
31004e6 |
dg = dstptr[1];
|
|
|
31004e6 |
- dg = (dg * (255 - a) + sg * a) / 255;
|
|
|
31004e6 |
dr = dstptr[2];
|
|
|
31004e6 |
+#else
|
|
|
31004e6 |
+ dr = dstptr[0];
|
|
|
31004e6 |
+ dg = dstptr[1];
|
|
|
31004e6 |
+ db = dstptr[2];
|
|
|
31004e6 |
+#endif
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+ db = (db * (255 - a) + sb * a) / 255;
|
|
|
31004e6 |
+ dg = (dg * (255 - a) + sg * a) / 255;
|
|
|
31004e6 |
dr = (dr * (255 - a) + sr * a) / 255;
|
|
|
31004e6 |
}
|
|
|
31004e6 |
|
|
|
31004e6 |
@@ -1145,13 +1152,13 @@ grub_video_fbblit_blend_RGB888_RGBA8888 (struct grub_video_fbblit_info *dst,
|
|
|
31004e6 |
}
|
|
|
31004e6 |
|
|
|
31004e6 |
#ifndef GRUB_CPU_WORDS_BIGENDIAN
|
|
|
31004e6 |
- db = dstptr[0];
|
|
|
31004e6 |
- dg = dstptr[1];
|
|
|
31004e6 |
- dr = dstptr[2];
|
|
|
31004e6 |
-#else
|
|
|
31004e6 |
dr = dstptr[0];
|
|
|
31004e6 |
dg = dstptr[1];
|
|
|
31004e6 |
db = dstptr[2];
|
|
|
31004e6 |
+#else
|
|
|
31004e6 |
+ db = dstptr[0];
|
|
|
31004e6 |
+ dg = dstptr[1];
|
|
|
31004e6 |
+ dr = dstptr[2];
|
|
|
31004e6 |
#endif
|
|
|
31004e6 |
|
|
|
31004e6 |
dr = (dr * (255 - a) + sr * a) / 255;
|
|
|
31004e6 |
--
|
|
|
31004e6 |
1.8.2.1
|
|
|
31004e6 |
|