aboutsummaryrefslogtreecommitdiff
path: root/video/bink_decoder.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2013-01-09 07:01:30 +0100
committerJohannes Schickel2013-01-09 07:24:37 +0100
commit0e3f8d68c45c5208ace3439ba6859a30bc90c3ac (patch)
treee264de4583817aecabec820d817543c0f597d539 /video/bink_decoder.cpp
parent9f22d60adf62843fac04255d79f1986cdb7fa28a (diff)
downloadscummvm-rg350-0e3f8d68c45c5208ace3439ba6859a30bc90c3ac.tar.gz
scummvm-rg350-0e3f8d68c45c5208ace3439ba6859a30bc90c3ac.tar.bz2
scummvm-rg350-0e3f8d68c45c5208ace3439ba6859a30bc90c3ac.zip
VIDEO: Silence C++11 narrowing warnings.
Diffstat (limited to 'video/bink_decoder.cpp')
-rw-r--r--video/bink_decoder.cpp4
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++) {