[Scummvm-cvs-logs] scummvm master -> bb1ebffbea325eeb10ffbe04ba6406b0e68217a2

[clone2727]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ebc5a75ca3 IMAGE: Mark Cinepak as being used by Sherlock
bb1ebffbea IMAGE: Move a memcpy out of a loop it shouldn't be in


Commit: ebc5a75ca3936dce64c33f8ee0a22cc6e9dfce50
    https://github.com/scummvm/scummvm/commit/ebc5a75ca3936dce64c33f8ee0a22cc6e9dfce50
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2015-06-04T20:26:29-04:00

Commit Message:
IMAGE: Mark Cinepak as being used by Sherlock

Changed paths:
    image/codecs/cinepak.h



diff --git a/image/codecs/cinepak.h b/image/codecs/cinepak.h
index dc8172e..3ca8f51 100644
--- a/image/codecs/cinepak.h
+++ b/image/codecs/cinepak.h
@@ -64,6 +64,9 @@ struct CinepakFrame {
  * Cinepak decoder.
  *
  * Used by BMP/AVI and PICT/QuickTime.
+ *
+ * Used in engines:
+ *  - sherlock
  */
 class CinepakDecoder : public Codec {
 public:


Commit: bb1ebffbea325eeb10ffbe04ba6406b0e68217a2
    https://github.com/scummvm/scummvm/commit/bb1ebffbea325eeb10ffbe04ba6406b0e68217a2
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2015-06-04T20:26:29-04:00

Commit Message:
IMAGE: Move a memcpy out of a loop it shouldn't be in

Changed paths:
    image/codecs/cinepak.cpp



diff --git a/image/codecs/cinepak.cpp b/image/codecs/cinepak.cpp
index 32f6be2..4e85892 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();