[Scummvm-cvs-logs] scummvm master -> 2b3af190db0076576c310b96cf52d7952034aca3

sev- sev at scummvm.org
Thu Aug 25 12:18:38 CEST 2016


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2b3af190db GRAPHICS: Fix potential rounding errors in the h/v thick line drawing


Commit: 2b3af190db0076576c310b96cf52d7952034aca3
    https://github.com/scummvm/scummvm/commit/2b3af190db0076576c310b96cf52d7952034aca3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-08-25T12:18:11+02:00

Commit Message:
GRAPHICS: Fix potential rounding errors in the h/v thick line drawing

Changed paths:
    graphics/primitives.cpp



diff --git a/graphics/primitives.cpp b/graphics/primitives.cpp
index a879fc9..ee24020 100644
--- a/graphics/primitives.cpp
+++ b/graphics/primitives.cpp
@@ -108,11 +108,13 @@ void drawThickLine2(int x1, int y1, int x2, int y2, int thick, int color, void (
 	int dy = abs(y2 - y1);
 
 	if (dx == 0) {
-		Common::Rect r(x1 - thick / 2, MIN(y1, y2), x1 + thick / 2, MAX(y1, y2));
+		int xn = x1 - thick / 2;
+		Common::Rect r(xn, MIN(y1, y2), xn + thick, MAX(y1, y2));
 		drawFilledRect(r, color, plotProc, data);
 		return;
 	} else if (dy == 0) {
-		Common::Rect r(MIN(x1, x2), y1 - thick / 2, MAX(x1, x2), y1 + thick / 2);
+		int yn = y1 - thick / 2;
+		Common::Rect r(MIN(x1, x2), yn, MAX(x1, x2), yn + thick);
 		drawFilledRect(r, color, plotProc, data);
 		return;
 	}






More information about the Scummvm-git-logs mailing list