diff options
| author | Johannes Schickel | 2013-01-26 05:25:14 -0800 |
|---|---|---|
| committer | Johannes Schickel | 2013-01-26 05:25:14 -0800 |
| commit | 59dde5451908de79a89ee29937f3878cf221cc93 (patch) | |
| tree | af40548096459f766726938a0db278224f48705a /video | |
| parent | 94edb3409fa949a6391c54adb4bf7fc4a1d210ad (diff) | |
| parent | 4d3ecbfcd2aabf0885df978e6e44ef8b8256c657 (diff) | |
| download | scummvm-rg350-59dde5451908de79a89ee29937f3878cf221cc93.tar.gz scummvm-rg350-59dde5451908de79a89ee29937f3878cf221cc93.tar.bz2 scummvm-rg350-59dde5451908de79a89ee29937f3878cf221cc93.zip | |
Merge pull request #301 from lordhoto/c++11-playground
RFC: Allow use of override and nullptr. Also allow C++11 compilation.
Diffstat (limited to 'video')
| -rw-r--r-- | video/bink_decoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp index 1ece22c963..45dec0887b 100644 --- a/video/bink_decoder.cpp +++ b/video/bink_decoder.cpp @@ -557,8 +557,8 @@ void BinkDecoder::BinkVideoTrack::initBundles() { _bundles[i].dataEnd = _bundles[i].data + blocks * 64; } - uint32 cbw[2] = { (_surface.w + 7) >> 3, (_surface.w + 15) >> 4 }; - uint32 cw [2] = { _surface.w , _surface.w >> 1 }; + uint32 cbw[2] = { (uint32)((_surface.w + 7) >> 3), (uint32)((_surface.w + 15) >> 4) }; + uint32 cw [2] = { (uint32)( _surface.w ), (uint32)( _surface.w >> 1) }; // Calculate the lengths of an element count in bits for (int i = 0; i < 2; i++) { |