2010-02-20 Vladimir Serbinenko <phcoder@gmail.com>

	* video/fb/video_fb.c (grub_video_fb_scroll): Fix a pixel size bug.
	Reported by: Michael Suchanek.

diff --git a/ChangeLog b/ChangeLog
index 38bb39ac9380f25b6eff5bca495b52bccb690b5f..ca8e3c3fdd2dfeaf040aba1d1baa0c1838b3d1c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2010-02-14  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+2010-02-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * video/fb/video_fb.c (grub_video_fb_scroll): Fix a pixel size bug.
+       Reported by: Michael Suchanek.
+
+2010-02-18  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
        * util/grub-mkconfig.in: Export GRUB_INIT_TUNE.
        * util/grub.d/00_header.in: Handle GRUB_INIT_TUNE.

diff --git a/video/fb/video_fb.c b/video/fb/video_fb.c
index 65652c3cf5d4715d28da3f752aecaf8dbc4bdb11..9c5577bb9cfa53854613f6860012296fe405e0d9 100644 (file)
--- a/video/fb/video_fb.c
+++ b/video/fb/video_fb.c
@@ -1006,11 +1006,13 @@ grub_video_fb_scroll (grub_video_color_t color, int dx, int dy)
        {                                                            \
          /* 3b. Move data downwards.  */                            \
          dst = (void *) grub_video_fb_get_video_ptr (&target,       \
-                                            dst_x + width - 1,      \
+                                                     dst_x + width, \
                                             dst_y + height - 1);    \
          src = (void *) grub_video_fb_get_video_ptr (&target,       \
-                                            src_x + width - 1,      \
+                                                     src_x + width, \
                                             src_y + height - 1);    \
+         dst--;                                                     \
+          src--;                                                     \
          for (j = 0; j < height; j++)                               \
            {                                                        \
              for (i = 0; i < linelen; i++)                          \