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

* term/gfxterm.c (grub_gfxterm_background_image_cmd): Fix

Browse source 
indentation.
This commit is contained in:
Colin Watson 2010-07-07 14:12:16 +01:00
parent 0b0f9620f2
commit f7bf0918aa
2 changed files with 40 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-07-07 Colin Watson <cjwatson@ubuntu.com>
* term/gfxterm.c (grub_gfxterm_background_image_cmd): Fix
indentation.
2010-07-06 Colin Watson <cjwatson@ubuntu.com> 2010-07-06 Colin Watson <cjwatson@ubuntu.com>
* conf/common.rmk (grub_probe_SOURCES): Add disk/raid5_recover.c * conf/common.rmk (grub_probe_SOURCES): Add disk/raid5_recover.c

70
term/gfxterm.c
View file

@ -1134,44 +1134,44 @@ grub_gfxterm_background_image_cmd (grub_extcmd_t cmd __attribute__ ((unused)),
/* If filename was provided, try to load that. */ /* If filename was provided, try to load that. */
if (argc >= 1) if (argc >= 1)
{ {
/* Try to load new one. */ /* Try to load new one. */
grub_video_bitmap_load (&bitmap, args[0]); grub_video_bitmap_load (&bitmap, args[0]);
if (grub_errno != GRUB_ERR_NONE) if (grub_errno != GRUB_ERR_NONE)
return grub_errno; return grub_errno;
/* Determine if the bitmap should be scaled to fit the screen. */ /* Determine if the bitmap should be scaled to fit the screen. */
if (!state[BACKGROUND_CMD_ARGINDEX_MODE].set if (!state[BACKGROUND_CMD_ARGINDEX_MODE].set
|| grub_strcmp (state[BACKGROUND_CMD_ARGINDEX_MODE].arg, || grub_strcmp (state[BACKGROUND_CMD_ARGINDEX_MODE].arg,
"stretch") == 0) "stretch") == 0)
{
if (window.width != grub_video_bitmap_get_width (bitmap)
|| window.height != grub_video_bitmap_get_height (bitmap))
{
struct grub_video_bitmap *scaled_bitmap;
grub_video_bitmap_create_scaled (&scaled_bitmap,
window.width,
window.height,
bitmap,
GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST);
if (grub_errno == GRUB_ERR_NONE)
{
/* Replace the original bitmap with the scaled one. */
grub_video_bitmap_destroy (bitmap);
bitmap = scaled_bitmap;
}
}
}
/* If bitmap was loaded correctly, display it. */
if (bitmap)
{ {
if (window.width != grub_video_bitmap_get_width (bitmap) /* Determine bitmap dimensions. */
|| window.height != grub_video_bitmap_get_height (bitmap)) bitmap_width = grub_video_bitmap_get_width (bitmap);
{ bitmap_height = grub_video_bitmap_get_height (bitmap);
struct grub_video_bitmap *scaled_bitmap;
grub_video_bitmap_create_scaled (&scaled_bitmap, /* Mark whole screen as dirty. */
window.width, dirty_region_add (0, 0, window.width, window.height);
window.height,
bitmap,
GRUB_VIDEO_BITMAP_SCALE_METHOD_BEST);
if (grub_errno == GRUB_ERR_NONE)
{
/* Replace the original bitmap with the scaled one. */
grub_video_bitmap_destroy (bitmap);
bitmap = scaled_bitmap;
}
}
} }
/* If bitmap was loaded correctly, display it. */
if (bitmap)
{
/* Determine bitmap dimensions. */
bitmap_width = grub_video_bitmap_get_width (bitmap);
bitmap_height = grub_video_bitmap_get_height (bitmap);
/* Mark whole screen as dirty. */
dirty_region_add (0, 0, window.width, window.height);
}
} }
/* All was ok. */ /* All was ok. */