[Scummvm-cvs-logs] CVS: scummvm/common scaler.cpp,1.62,1.63

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Tue Aug 10 10:47:05 CEST 2004


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25248

Modified Files:
	scaler.cpp 
Log Message:
Relaxed the assertion for the 3x scaler a bit. Since it uses pointers to
uint16, it should be enough that dstPtr is even; it doesn't have to be a
multiple of four.

The old assertion failed for me when I used the 3x scaler without aspect
ratio correction.


Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- scaler.cpp	8 Aug 2004 15:45:58 -0000	1.62
+++ scaler.cpp	10 Aug 2004 17:46:04 -0000	1.63
@@ -148,7 +148,7 @@
 	const uint32 dstPitch2 = dstPitch * 2;
 	const uint32 dstPitch3 = dstPitch * 3;
 
-	assert(((int)dstPtr & 3) == 0);
+	assert(((int)dstPtr & 1) == 0);
 	while (height--) {
 		r = dstPtr;
 		for (int i = 0; i < width; ++i, r += 6) {





More information about the Scummvm-git-logs mailing list