[PATCH 1/3] 2d-primitives: fix missing pixel in gu_draw_line()

Nikita Yushchenko nikita.yoush at cogentembedded.com
Thu Oct 12 10:52:26 PDT 2017


When drawing line from (x1, y1) to (x2, y2), pixel at (x2, y2) should
be included.

Signed-off-by: Nikita Yushchenko <nikita.yoush at cogentembedded.com>
---
 lib/gui/2d-primitives.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gui/2d-primitives.c b/lib/gui/2d-primitives.c
index 0f29b32ba..89acc092d 100644
--- a/lib/gui/2d-primitives.c
+++ b/lib/gui/2d-primitives.c
@@ -61,7 +61,7 @@ static void draw_simple_line(struct screen *sc,
 		swap(y1, y2);
 	}
 
-	for (x = x1; x < x2 - 1; x++) {
+	for (x = x1; x <= x2; x++) {
 		if (!dash ||
 		    (++pixel % (2 * dash)) < dash)
 			illuminate(sc->info,
@@ -137,7 +137,7 @@ void gu_draw_line(struct screen *sc,
 	j   = y1;
 	eps = dy - dx;
 
-	for (i = x1; i <= x2 - 1; i++) {
+	for (i = x1; i <= x2; i++) {
 		if (!dash ||
 		    (++pixel % (2 * dash)) > dash) {
 			illuminate(sc->info,
-- 
2.11.0




More information about the barebox mailing list