aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2004-08-10 17:46:04 +0000
committerTorbjörn Andersson2004-08-10 17:46:04 +0000
commit039e6dc8dbb6e585684dd9cd37d8f412e0c72a53 (patch)
tree28af85bd29ddffd26785ba61175c98a7effcecf0
parentd42e2af68a85d247bedaedc64e8d421fd8ba70c4 (diff)
downloadscummvm-rg350-039e6dc8dbb6e585684dd9cd37d8f412e0c72a53.tar.gz
scummvm-rg350-039e6dc8dbb6e585684dd9cd37d8f412e0c72a53.tar.bz2
scummvm-rg350-039e6dc8dbb6e585684dd9cd37d8f412e0c72a53.zip
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. svn-id: r14536
-rw-r--r--common/scaler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/scaler.cpp b/common/scaler.cpp
index 77ebdb951a..766738eeef 100644
--- a/common/scaler.cpp
+++ b/common/scaler.cpp
@@ -148,7 +148,7 @@ void Normal3x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit
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) {