From 1ccce5f1a269635dcb76f8620d10b6ad65cdea90 Mon Sep 17 00:00:00 2001 From: CTCaer Date: Mon, 16 Dec 2019 21:49:54 +0200 Subject: [PATCH] gfx: Fix off-by-one in right half of 16px rendering --- bootloader/gfx/gfx.c | 3 ++- nyx/nyx_gui/gfx/gfx.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bootloader/gfx/gfx.c b/bootloader/gfx/gfx.c index e2eabf1..3560b9f 100644 --- a/bootloader/gfx/gfx.c +++ b/bootloader/gfx/gfx.c @@ -187,7 +187,7 @@ void gfx_putc(char c) for (u32 i = 0; i < 16; i += 2) { - u8 v = *cbuf++; + u8 v = *cbuf; for (u32 k = 0; k < 2; k++) { for (u32 j = 0; j < 8; j++) @@ -212,6 +212,7 @@ void gfx_putc(char c) fb += gfx_ctxt.stride - 16; v = *cbuf; } + cbuf++; } gfx_con.x += 16; } diff --git a/nyx/nyx_gui/gfx/gfx.c b/nyx/nyx_gui/gfx/gfx.c index 8baa1d9..4a74d43 100644 --- a/nyx/nyx_gui/gfx/gfx.c +++ b/nyx/nyx_gui/gfx/gfx.c @@ -187,7 +187,7 @@ void gfx_putc(char c) for (u32 i = 0; i < 16; i += 2) { - u8 v = *cbuf++; + u8 v = *cbuf; for (u32 k = 0; k < 2; k++) { for (u32 j = 0; j < 8; j++) @@ -212,6 +212,7 @@ void gfx_putc(char c) fb += gfx_ctxt.stride - 16; v = *cbuf; } + cbuf++; } gfx_con.x += 16; }