[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2635] 2009-10-15 Vladimir Serbinenko <address@hidden>
From: |
Vladimir Serbinenko |
Subject: |
[2635] 2009-10-15 Vladimir Serbinenko <address@hidden> |
Date: |
Thu, 15 Oct 2009 12:40:16 +0000 |
Revision: 2635
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2635
Author: phcoder
Date: 2009-10-15 12:40:13 +0000 (Thu, 15 Oct 2009)
Log Message:
-----------
2009-10-15 Vladimir Serbinenko <address@hidden>
* loader/i386/pc/xnu.c (grub_xnu_set_video): Fix loading splash image.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/loader/i386/pc/xnu.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-10-15 12:26:30 UTC (rev 2634)
+++ trunk/grub2/ChangeLog 2009-10-15 12:40:13 UTC (rev 2635)
@@ -1,5 +1,9 @@
2009-10-15 Vladimir Serbinenko <address@hidden>
+ * loader/i386/pc/xnu.c (grub_xnu_set_video): Fix loading splash image.
+
+2009-10-15 Vladimir Serbinenko <address@hidden>
+
* commands/xnu_uuid.c (grub_cmd_xnu_uuid): Remove duplicated bitwise
operations.
Modified: trunk/grub2/loader/i386/pc/xnu.c
===================================================================
--- trunk/grub2/loader/i386/pc/xnu.c 2009-10-15 12:26:30 UTC (rev 2634)
+++ trunk/grub2/loader/i386/pc/xnu.c 2009-10-15 12:40:13 UTC (rev 2635)
@@ -43,7 +43,6 @@
{
struct grub_video_mode_info mode_info;
int ret;
- int x,y;
char *tmp, *modevar;
void *framebuffer;
grub_err_t err;
@@ -66,32 +65,37 @@
if (err)
return err;
+ if (grub_xnu_bitmap)
+ {
+ int x, y;
+
+ x = mode_info.width - grub_xnu_bitmap->mode_info.width;
+ x /= 2;
+ y = mode_info.height - grub_xnu_bitmap->mode_info.height;
+ y /= 2;
+ err = grub_video_blit_bitmap (grub_xnu_bitmap,
+ GRUB_VIDEO_BLIT_REPLACE,
+ x > 0 ? x : 0,
+ y > 0 ? y : 0,
+ x < 0 ? -x : 0,
+ y < 0 ? -y : 0,
+ min (grub_xnu_bitmap->mode_info.width,
+ mode_info.width),
+ min (grub_xnu_bitmap->mode_info.height,
+ mode_info.height));
+ if (err)
+ {
+ grub_print_error ();
+ grub_errno = GRUB_ERR_NONE;
+ grub_xnu_bitmap = 0;
+ }
+ err = GRUB_ERR_NONE;
+ }
+
ret = grub_video_get_info_and_fini (&mode_info, &framebuffer);
if (ret)
return grub_error (GRUB_ERR_IO, "couldn't retrieve video parameters");
- err = GRUB_ERR_NONE;
- x = mode_info.width - grub_xnu_bitmap->mode_info.width;
- x /= 2;
- y = mode_info.height - grub_xnu_bitmap->mode_info.height;
- y /= 2;
- err = grub_video_blit_bitmap (grub_xnu_bitmap,
- GRUB_VIDEO_BLIT_REPLACE,
- x > 0 ? x : 0,
- y > 0 ? y : 0,
- x < 0 ? -x : 0,
- y < 0 ? -y : 0,
- min (grub_xnu_bitmap->mode_info.width,
- mode_info.width),
- min (grub_xnu_bitmap->mode_info.height,
- mode_info.height));
- if (err)
- {
- grub_print_error ();
- grub_errno = GRUB_ERR_NONE;
- grub_xnu_bitmap = 0;
- }
-
params->lfb_width = mode_info.width;
params->lfb_height = mode_info.height;
params->lfb_depth = mode_info.bpp;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2635] 2009-10-15 Vladimir Serbinenko <address@hidden>,
Vladimir Serbinenko <=