[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.44,1.45

Pawel Kolodziejski aquadran at users.sourceforge.net
Mon Aug 18 08:30:09 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv12073/smush

Modified Files:
	smush_player.cpp 
Log Message:
some changes for smush codec 1 and 3, handled by bomp decompression

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- smush_player.cpp	18 Aug 2003 06:29:39 -0000	1.44
+++ smush_player.cpp	18 Aug 2003 15:13:15 -0000	1.45
@@ -712,8 +712,8 @@
 
 	switch (codec) {
 	case 1:
+		bompDecodeLine(_dst, chunk_buffer, chunk_size);
 	case 3:
-#if 1
 		// FIXME: I am not 100% sure if this is correct. I tried to test this,
 		// but the only place I found codec 1 being used was in FT.
 		// But either is the codec only used to encode all-black frames, or
@@ -722,11 +722,7 @@
 		// BTW regarding codec 3: I haven't yet actually seen it being used,
 		// but is it really identical to codec 1? Or isn't it maybe a
 		// 'reverse' version (see also bompDecodeLineReverse).
-		decompressBomp(_dst, chunk_buffer, _width, _height);
-#else
-		extern void smush_decode_codec1(byte *dst, byte *src, int height);
-		smush_decode_codec1(_dst, chunk_buffer, _height);
-#endif
+		bompDecodeLineReverse(_dst, chunk_buffer, chunk_size);
 		break;
 	case 37:
 		_codec37.decode(_dst, chunk_buffer);





More information about the Scummvm-git-logs mailing list