IMAGE: Added Indeo4Decoder decodePictureHeader, and lots of dependencies

1 files changed, 23 insertions, 1 deletions

diff --git a/image/codecs/indeo/get_bits.cpp b/image/codecs/indeo/get_bits.cpp
index 4878bc674f..98cef7facd 100644
--- a/image/codecs/indeo/get_bits.cpp
+++ b/image/codecs/indeo/get_bits.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "image/codecs/indeo/get_bits.h"
+#include "common/algorithm.h"
 #include "common/endian.h"
 #include "common/textconsole.h"
 
@@ -160,14 +161,35 @@ GetBits::GetBits(const byte *buffer, size_t totalBits) {
 	assert(buffer && totalBits < (INT_MAX - 7));
 
 	_buffer = buffer;
+	_disposeAfterUse = DisposeAfterUse::NO;
 	_sizeInBits = totalBits;
 	_sizeInBitsPlus8 = totalBits + 8;
 	_index = 0;
 }
 
+GetBits::GetBits(Common::SeekableReadStream &stream) {
+	byte *buffer = new byte[stream.size()];
+	stream.read(buffer, stream.size());
+	_buffer = buffer;
+	_disposeAfterUse = DisposeAfterUse::YES;
+	_sizeInBits = stream.size() * 8;
+	_sizeInBitsPlus8 = _sizeInBits + 8;
+	_index = 0;
+}
 
 GetBits::GetBits(const GetBits &src) : _index(src._index), _buffer(src._buffer),
-		_sizeInBits(src._sizeInBits), _sizeInBitsPlus8(src._sizeInBitsPlus8) {	
+		_sizeInBits(src._sizeInBits), _sizeInBitsPlus8(src._sizeInBitsPlus8),
+		_disposeAfterUse(src._disposeAfterUse) {	
+	if (_disposeAfterUse == DisposeAfterUse::YES) {
+		byte *buffer = new byte[src._sizeInBits / 8];
+		Common::copy(src._buffer, src._buffer + (src._sizeInBits / 8), buffer);
+		_buffer = buffer;
+	}
+}
+
+GetBits::~GetBits() {
+	if (_disposeAfterUse == DisposeAfterUse::YES)
+		delete[] _buffer;
 }
 
 int GetBits::getXbits(int n) {