[Scummvm-cvs-logs] scummvm master -> 37b5b6417908c22a4f8526599b7814900bf1c5f5

[sev-]

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

Summary:
1f4af34a40 WAGE: Fix calculation for bitmap bboxes
37b5b64179 WAGE: Improved a bit bounds calculation. Still bad


Commit: 1f4af34a40f5175f0948f0bff00b384f5447b4dc
    https://github.com/scummvm/scummvm/commit/1f4af34a40f5175f0948f0bff00b384f5447b4dc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-09T23:53:07+01:00

Commit Message:
WAGE: Fix calculation for bitmap bboxes

Changed paths:
    engines/wage/design.cpp



diff --git a/engines/wage/design.cpp b/engines/wage/design.cpp
index 1fd1dd5..d0b84f1 100644
--- a/engines/wage/design.cpp
+++ b/engines/wage/design.cpp
@@ -466,7 +466,7 @@ void Design::drawBitmap(Graphics::Surface *surface, Common::SeekableReadStream &
 
 			for (int c = 0; c < 8; c++) {
 				if (_boundsCalculationMode) {
-					adjustBounds(x, y);
+					adjustBounds(x1 + x, y1 + y);
 				} else if (x1 + x >= 0 && x1 + x < surface->w && y1 + y >= 0 && y1 + y < surface->h)
 					*((byte *)tmp.getBasePtr(x, y)) = (color & (1 << (7 - c % 8))) ? kColorBlack : kColorWhite;
 				x++;


Commit: 37b5b6417908c22a4f8526599b7814900bf1c5f5
    https://github.com/scummvm/scummvm/commit/37b5b6417908c22a4f8526599b7814900bf1c5f5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-09T23:53:07+01:00

Commit Message:
WAGE: Improved a bit bounds calculation. Still bad

Changed paths:
    engines/wage/design.cpp



diff --git a/engines/wage/design.cpp b/engines/wage/design.cpp
index d0b84f1..677efd0 100644
--- a/engines/wage/design.cpp
+++ b/engines/wage/design.cpp
@@ -214,6 +214,8 @@ void drawPixel(int x, int y, int color, void *data) {
 		return;
 
 	if (p->design && p->design->isBoundsCalculation()) {
+		if (x < 0 || y < 0)
+			return;
 		if (p->thickness == 1) {
 			p->design->adjustBounds(x, y);
 		} else {