diff options
| author | Kamil Zbróg | 2013-10-19 12:40:55 +0100 |
|---|---|---|
| committer | Kamil Zbróg | 2013-10-19 12:40:55 +0100 |
| commit | 852a9637119b544400984508ca20ccf47ed66a81 (patch) | |
| tree | 34f4091af3ee3f08b6ee32092eaf28d7b8a62f83 /engines/draci/sprite.cpp | |
| parent | 3a4068f87be678bd7446c32a1baa8869522ebd71 (diff) | |
| parent | a9aaca460875c6d7a244e3f36a1cad62ec09411d (diff) | |
| download | scummvm-rg350-852a9637119b544400984508ca20ccf47ed66a81.tar.gz scummvm-rg350-852a9637119b544400984508ca20ccf47ed66a81.tar.bz2 scummvm-rg350-852a9637119b544400984508ca20ccf47ed66a81.zip | |
Merge branch 'master' into prince
Conflicts:
engines/plugins_table.h
Diffstat (limited to 'engines/draci/sprite.cpp')
| -rw-r--r-- | engines/draci/sprite.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/draci/sprite.cpp b/engines/draci/sprite.cpp index 965cdabf3e..9a78904d25 100644 --- a/engines/draci/sprite.cpp +++ b/engines/draci/sprite.cpp @@ -38,9 +38,9 @@ const Displacement kNoDisplacement = { 0, 0, 1.0, 1.0 }; * height height of the image in the buffer */ static void transformToRows(byte *img, uint16 width, uint16 height) { - byte *buf = new byte[width * height]; + byte *buf = new byte[(uint)(width * height)]; byte *tmp = buf; - memcpy(buf, img, width * height); + memcpy(buf, img, (uint)(width * height)); for (uint16 i = 0; i < width; ++i) { for (uint16 j = 0; j < height; ++j) { |