From 6ab01cbf6be2ba5aaf6d43b3d5b361c050a5f235 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Tue, 31 Jul 2012 13:35:18 +0200 Subject: [PATCH] uterm: video: fix blit() and fill() height adjustments Whoops, we missed the last line for all blit()/fill() operations. Fix the decrement to correctly count as many lines as given. Signed-off-by: David Herrmann --- src/uterm_video_dumb.c | 4 ++-- src/uterm_video_fbdev.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/uterm_video_dumb.c b/src/uterm_video_dumb.c index 754e3ee..a1195a7 100644 --- a/src/uterm_video_dumb.c +++ b/src/uterm_video_dumb.c @@ -404,7 +404,7 @@ static int display_blit(struct uterm_display *disp, dst = &dst[y * rb->stride + x * 4]; src = buf->data; - while (--height) { + while (height--) { memcpy(dst, src, 4 * width); dst += rb->stride; src += buf->stride; @@ -446,7 +446,7 @@ static int display_fill(struct uterm_display *disp, dst = rb->map; dst = &dst[y * rb->stride + x * 4]; - while (--height) { + while (height--) { for (i = 0; i < width; ++i) { ((uint32_t*)dst)[i] = ((r & 0xff) << 16) | ((g & 0xff) << 8) | diff --git a/src/uterm_video_fbdev.c b/src/uterm_video_fbdev.c index eb3d79e..9bd0134 100644 --- a/src/uterm_video_fbdev.c +++ b/src/uterm_video_fbdev.c @@ -371,7 +371,7 @@ static int display_blit(struct uterm_display *disp, dst = &dst[y * disp->fbdev.stride + x * disp->fbdev.bpp]; src = buf->data; - while (--height) { + while (height--) { memcpy(dst, src, 4 * width); dst += disp->fbdev.stride; src += buf->stride; @@ -410,7 +410,7 @@ static int display_fill(struct uterm_display *disp, dst = &disp->fbdev.map[disp->fbdev.yres * disp->fbdev.stride]; dst = &dst[y * disp->fbdev.stride + x * disp->fbdev.bpp]; - while (--height) { + while (height--) { for (i = 0; i < width; ++i) { ((uint32_t*)dst)[i] = ((r & 0xff) << 16) | ((g & 0xff) << 8) | -- 2.7.4