[Scummvm-cvs-logs] SF.net SVN: scummvm:[41356] scummvm/trunk/graphics/video/smk_decoder.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Mon Jun 8 00:34:03 CEST 2009


Revision: 41356
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41356&view=rev
Author:   thebluegr
Date:     2009-06-07 22:34:03 +0000 (Sun, 07 Jun 2009)

Log Message:
-----------
Changed the bitstream buffer used to initialize the big Huffman trees to be a normal byte array, instead of a Common::Array

Modified Paths:
--------------
    scummvm/trunk/graphics/video/smk_decoder.cpp

Modified: scummvm/trunk/graphics/video/smk_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/smk_decoder.cpp	2009-06-07 22:19:48 UTC (rev 41355)
+++ scummvm/trunk/graphics/video/smk_decoder.cpp	2009-06-07 22:34:03 UTC (rev 41356)
@@ -30,7 +30,6 @@
 #include "graphics/video/smk_decoder.h"
 
 #include "common/archive.h"
-#include "common/array.h"
 #include "common/endian.h"
 #include "common/util.h"
 #include "common/stream.h"
@@ -488,17 +487,18 @@
 	for (i = 0; i < _videoInfo.frameCount; ++i)
 		_frameTypes[i] = _fileStream->readByte();
 
-	Common::Array<byte> huffmanTrees;
-	huffmanTrees.resize(_header.treesSize);
-	_fileStream->read(&huffmanTrees[0], _header.treesSize);
+	byte *huffmanTrees = new byte[_header.treesSize];
+	_fileStream->read(huffmanTrees, _header.treesSize);
 
-	BitStream bs(&huffmanTrees[0], _header.treesSize);
+	BitStream bs(huffmanTrees, _header.treesSize);
 
 	_MMapTree = new BigHuffmanTree(bs, _header.mMapSize);
 	_MClrTree = new BigHuffmanTree(bs, _header.mClrSize);
 	_FullTree = new BigHuffmanTree(bs, _header.fullSize);
 	_TypeTree = new BigHuffmanTree(bs, _header.typeSize);
 
+	delete[] huffmanTrees;
+
 	_videoFrameBuffer = (byte *)malloc(2 * _videoInfo.width * _videoInfo.height);
 	memset(_videoFrameBuffer, 0, 2 * _videoInfo.width * _videoInfo.height);
 	_palette = (byte *)malloc(3 * 256);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list