From 61329bcee456644886c80315f35e38692bf43844 Mon Sep 17 00:00:00 2001 From: Kazutaka YOKOTA Date: Mon, 11 Jan 1999 17:32:22 +0000 Subject: [PATCH] Update the pointer into the bitmap correctly. The previous code had the pointer off by 4 bytes if the width of the bitmap is a multiple of four. --- sys/dev/fb/splash_bmp.c | 4 ++-- sys/modules/splash/bmp/splash_bmp.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/fb/splash_bmp.c b/sys/dev/fb/splash_bmp.c index ebf007a50059..bfb5916029e4 100644 --- a/sys/dev/fb/splash_bmp.c +++ b/sys/dev/fb/splash_bmp.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id:$ + * $Id: splash_bmp.c,v 1.1 1999/01/11 03:34:56 yokota Exp $ */ #include @@ -382,7 +382,7 @@ bmp_DecodeLine(BMP_INFO *info, int line) case BI_RGB: for (x = 0; x < info->width; x++, info->index++) bmp_SetPix(info, x, line, *info->index); - info->index += 4 - (x % 4); + info->index += 3 - (--x % 4); break; case BI_RLE4: bmp_DecodeRLE4(info, line); diff --git a/sys/modules/splash/bmp/splash_bmp.c b/sys/modules/splash/bmp/splash_bmp.c index ebf007a50059..bfb5916029e4 100644 --- a/sys/modules/splash/bmp/splash_bmp.c +++ b/sys/modules/splash/bmp/splash_bmp.c @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id:$ + * $Id: splash_bmp.c,v 1.1 1999/01/11 03:34:56 yokota Exp $ */ #include @@ -382,7 +382,7 @@ bmp_DecodeLine(BMP_INFO *info, int line) case BI_RGB: for (x = 0; x < info->width; x++, info->index++) bmp_SetPix(info, x, line, *info->index); - info->index += 4 - (x % 4); + info->index += 3 - (--x % 4); break; case BI_RLE4: bmp_DecodeRLE4(info, line);