[Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec1.cpp,1.15,1.16 smush_player.cpp,1.165,1.166

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19796/scumm/smush

Modified Files:
	codec1.cpp smush_player.cpp 
Log Message:
committed patch #1221592, smush_codec 21/44 should match the original interpreter behaviour now (this allows to cleanup a bit the code and get rid of some hacks).

Index: codec1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec1.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- codec1.cpp	1 Jan 2005 16:09:18 -0000	1.15
+++ codec1.cpp	17 Jun 2005 18:10:51 -0000	1.16
@@ -24,12 +24,12 @@
 
 namespace Scumm {
 
-void smush_decode_codec1(byte *dst, byte *src, int left, int top, int height, int width, int dstWidth) {
+void smush_decode_codec1(byte *dst, const byte *src, int left, int top, int width, int height, int pitch) {
 	byte val, code;
 	int32 length;
 	int h = height, size_line;
 
-	dst += top * dstWidth;
+	dst += top * pitch;
 	for (h = 0; h < height; h++) {
 		size_line = READ_LE_UINT16(src);
 		src += 2;
@@ -54,7 +54,7 @@
 				}
 			}
 		}
-		dst += dstWidth - left - width;
+		dst += pitch - left - width;
 	}
 }
 

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- smush_player.cpp	11 Jun 2005 15:46:00 -0000	1.165
+++ smush_player.cpp	17 Jun 2005 18:10:51 -0000	1.166
@@ -724,7 +724,7 @@
 	setDirtyColors(0, 255);
 }
 
-void smush_decode_codec1(byte *dst, byte *src, int left, int top, int height, int width, int dstWidth);
+void smush_decode_codec1(byte *dst, const byte *src, int left, int top, int width, int height, int pitch);
 
 #ifdef USE_ZLIB
 void SmushPlayer::handleZlibFrameObject(Chunk &b) {
@@ -781,7 +781,7 @@
 	switch (codec) {
 	case 1:
 	case 3:
-		smush_decode_codec1(_dst, fobjBuffer + 14, left, top, height, width, _vm->_screenWidth);
+		smush_decode_codec1(_dst, fobjBuffer + 14, left, top, width, height, _vm->_screenWidth);
 		break;
 	case 37:
 		_codec37.decode(_dst, fobjBuffer + 14);
@@ -855,7 +855,7 @@
 	switch (codec) {
 	case 1:
 	case 3:
-		smush_decode_codec1(_dst, chunk_buffer, left, top, height, width, _vm->_screenWidth);
+		smush_decode_codec1(_dst, chunk_buffer, left, top, width, height, _vm->_screenWidth);
 		break;
 	case 37:
 		_codec37.decode(_dst, chunk_buffer);