[Scummvm-cvs-logs] CVS: scummvm/common scaler.cpp,1.12,1.13

Max Horn fingolfin at users.sourceforge.net
Thu May 15 17:12:06 CEST 2003


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv30360

Modified Files:
	scaler.cpp 
Log Message:
fix advmame scaler ('flickering', observable in e.g. Sam&Max, and the left-screen-border-black bug). Note: this change might look fishy to you but is perfectly legal because our frame buffers put a border around the screen data to accomodate for this

Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- scaler.cpp	9 May 2003 22:44:16 -0000	1.12
+++ scaler.cpp	16 May 2003 00:11:35 -0000	1.13
@@ -726,9 +726,12 @@
 	uint16 G, H, I;
 
 	while (height--) {
-		B = C = *(p - nextlineSrc);
-		E = F = *(p);
-		H = I = *(p + nextlineSrc);
+		B = *(p - 1 - nextlineSrc);
+		E = *(p - 1);
+		H = *(p - 1 + nextlineSrc);
+		C = *(p - nextlineSrc);
+		F = *(p);
+		I = *(p + nextlineSrc);
 		for (int i = 0; i < width; ++i) {
 			p++;
 			A = B; B = C; C = *(p - nextlineSrc);
@@ -759,9 +762,12 @@
 	uint16 G, H, I;
 
 	while (height--) {
-		B = C = *(p - nextlineSrc);
-		E = F = *(p);
-		H = I = *(p + nextlineSrc);
+		B = *(p - 1 - nextlineSrc);
+		E = *(p - 1);
+		H = *(p - 1 + nextlineSrc);
+		C = *(p - nextlineSrc);
+		F = *(p);
+		I = *(p + nextlineSrc);
 		for (int i = 0; i < width; ++i) {
 			p++;
 			A = B; B = C; C = *(p - nextlineSrc);





More information about the Scummvm-git-logs mailing list