aboutsummaryrefslogtreecommitdiff
path: root/image
diff options
context:
space:
mode:
authorMatthew Hoops2015-06-04 20:24:43 -0400
committerMatthew Hoops2015-06-04 20:26:29 -0400
commitbb1ebffbea325eeb10ffbe04ba6406b0e68217a2 (patch)
tree797ee2da87721eccfa50cbcb4c1984a9ae256b4e /image
parentebc5a75ca3936dce64c33f8ee0a22cc6e9dfce50 (diff)
downloadscummvm-rg350-bb1ebffbea325eeb10ffbe04ba6406b0e68217a2.tar.gz
scummvm-rg350-bb1ebffbea325eeb10ffbe04ba6406b0e68217a2.tar.bz2
scummvm-rg350-bb1ebffbea325eeb10ffbe04ba6406b0e68217a2.zip
IMAGE: Move a memcpy out of a loop it shouldn't be in
Diffstat (limited to 'image')
-rw-r--r--image/codecs/cinepak.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/image/codecs/cinepak.cpp b/image/codecs/cinepak.cpp
index 32f6be2cd5..4e858921ee 100644
--- a/image/codecs/cinepak.cpp
+++ b/image/codecs/cinepak.cpp
@@ -433,9 +433,11 @@ const Graphics::Surface *CinepakDecoder::decodeFrame(Common::SeekableReadStream
for (uint16 j = 0; j < 256; j++) {
_curFrame.strips[i].v1_codebook[j] = _curFrame.strips[i - 1].v1_codebook[j];
_curFrame.strips[i].v4_codebook[j] = _curFrame.strips[i - 1].v4_codebook[j];
- memcpy(_curFrame.strips[i].v1_dither, _curFrame.strips[i - 1].v1_dither, 256 * 4 * 4 * 4);
- memcpy(_curFrame.strips[i].v4_dither, _curFrame.strips[i - 1].v4_dither, 256 * 4 * 4 * 4);
}
+
+ // Copy the QuickTime dither tables
+ memcpy(_curFrame.strips[i].v1_dither, _curFrame.strips[i - 1].v1_dither, 256 * 4 * 4 * 4);
+ memcpy(_curFrame.strips[i].v4_dither, _curFrame.strips[i - 1].v4_dither, 256 * 4 * 4 * 4);
}
_curFrame.strips[i].id = stream.readUint16BE();