diff options
| author | Max Horn | 2005-06-23 14:18:25 +0000 |
|---|---|---|
| committer | Max Horn | 2005-06-23 14:18:25 +0000 |
| commit | a35588b9ffd65f3ac468543802eab3f2bfe65b94 (patch) | |
| tree | 9f5d9c500a498867a896db15f38ee2decb65d155 /common | |
| parent | f80dab367cb73b3e98f16248bbfe602136cbcd9a (diff) | |
| download | scummvm-rg350-a35588b9ffd65f3ac468543802eab3f2bfe65b94.tar.gz scummvm-rg350-a35588b9ffd65f3ac468543802eab3f2bfe65b94.tar.bz2 scummvm-rg350-a35588b9ffd65f3ac468543802eab3f2bfe65b94.zip | |
Fix 64 bit compiler warning/error
svn-id: r18442
Diffstat (limited to 'common')
| -rw-r--r-- | common/scaler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/scaler.cpp b/common/scaler.cpp index 2d1996b6ba..17dcf837ea 100644 --- a/common/scaler.cpp +++ b/common/scaler.cpp @@ -154,7 +154,7 @@ void Normal2x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit int width, int height) { uint8 *r; - assert(((int)dstPtr & 3) == 0); + assert(((long)dstPtr & 3) == 0); while (height--) { r = dstPtr; for (int i = 0; i < width; ++i, r += 4) { @@ -179,7 +179,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 & 1) == 0); + assert(((long)dstPtr & 1) == 0); while (height--) { r = dstPtr; for (int i = 0; i < width; ++i, r += 6) { @@ -214,7 +214,7 @@ void Normal1o5xTemplate(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uin const uint32 dstPitch3 = dstPitch * 3; const uint32 srcPitch2 = srcPitch * 2; - assert(((int)dstPtr & 1) == 0); + assert(((long)dstPtr & 1) == 0); while (height > 0) { r = dstPtr; for (int i = 0; i < width; i += 2, r += 6) { |