Ticket #1981: smush3.patch

chunk.cpp

@@ -85 +85 @@
         return true;
 }
 
-FileChunk::FileChunk(const Common::String &name, int offset) 
-        : _name(name) {
-        if (!g_scumm->openFile(_data, name.c_str()))
+FileChunk::FileChunk(ScummFile *data, int offset) {
+        _data = data;
+        _deleteData = false;
+
+        _data->seek(offset, seek_start);
+        _type = _data->readUint32BE();
+        _size = _data->readUint32BE();
+        _offset = _data->pos();
+        _curPos = 0;
+}
+
+FileChunk::FileChunk(const Common::String &name, int offset) {
+        _data = new ScummFile();
+        _deleteData = true;
+        if (!g_scumm->openFile(*_data, name.c_str()))
                 error("FileChunk: Unable to open file %s", name.c_str());
 
-        _data.seek(offset);
-        _type = _data.readUint32BE();
-        _size = _data.readUint32BE();
-        _offset = _data.pos();
+        _data->seek(offset, seek_start);
+        _type = _data->readUint32BE();
+        _size = _data->readUint32BE();
+        _offset = _data->pos();
         _curPos = 0;
 }
 
 FileChunk::~FileChunk() {
+        if (_deleteData)
+                delete _data;
 }
 
 Chunk *FileChunk::subBlock() {
-        FileChunk *ptr = new FileChunk(_name, _offset + _curPos);
-        _data.seek(_offset + _curPos + sizeof(Chunk::type) + sizeof(uint32));
+        FileChunk *ptr = new FileChunk(_data, _offset + _curPos);
         seek(sizeof(Chunk::type) + sizeof(uint32) + ptr->getSize());
         return ptr;
 }
 
+void FileChunk::reseek() {
+        _data->seek(_offset + _curPos);
+}
+
 bool FileChunk::read(void *buffer, uint32 size) {
         if (size <= 0 || (_curPos + size) > _size)
                 error("invalid buffer read request");
 
-//      _data.seek(_offset + _curPos);
-        _data.read(buffer, size);
+        _data->read(buffer, size);
         _curPos += size;
         return true;
 }
@@ -122 +138 @@
 }
 
 byte FileChunk::getByte() {
-//      _data.seek(_offset + _curPos);
         _curPos++;
 
         if (_curPos > _size)
                 error("invalid byte read request");
 
-        return _data.readByte();
+        return _data->readByte();
 }
 
 int16 FileChunk::getShort() {
@@ -136 +151 @@
 }
 
 uint16 FileChunk::getWord() {
-//      _data.seek(_offset + _curPos);
         _curPos += 2;
 
         if (_curPos > _size)
                 error("invalid word read request");
 
-        return _data.readUint16LE();
+        return _data->readUint16LE();
 }
 
 uint32 FileChunk::getDword() {
-//      _data.seek(_offset + _curPos);
         _curPos += 4;
 
         if (_curPos > _size)
                 error("invalid dword read request");
 
-        return _data.readUint32LE();
+        return _data->readUint32LE();
 }
 
 MemoryChunk::MemoryChunk(byte *data) {
@@ -171 +184 @@
         return ptr;
 }
 
+void MemoryChunk::reseek() {
+}
+
 bool MemoryChunk::read(void *buffer, uint32 size) {
         if (size <= 0 || (_curPos + size) > _size)
                 error("invalid buffer read request");

chunk.h

@@ -39 +39 @@
         virtual type getType() const = 0;
         virtual uint32 getSize() const = 0;
         virtual Chunk *subBlock() = 0;
+        virtual void reseek() = 0;
         virtual bool eof() const = 0;
         virtual uint32 tell() const = 0;
         virtual bool seek(int32 delta, seek_type dir = seek_cur) = 0;
@@ -47 +48 @@
         virtual byte getByte() = 0;
         virtual int16 getShort() = 0;
         virtual uint16 getWord() = 0;
-        virtual uint32 getDword()= 0;
+        virtual uint32 getDword() = 0;
 };
 
 // Common functionality for concrete chunks (FileChunk, MemoryChunk)
@@ -69 +70 @@
 
 class FileChunk : public BaseChunk {
 private:
-        Common::String _name;
-        ScummFile _data;
+        ScummFile *_data;
+        bool _deleteData;
         uint32 _offset;
 
+        FileChunk(ScummFile *data, int offset);
 public:
         FileChunk(const Common::String &name, int offset = 0);
         virtual ~FileChunk();
         Chunk *subBlock();
+        void reseek();
         bool read(void *buffer, uint32 size);
         int8 getChar();
         byte getByte();
@@ -92 +95 @@
 public:
         MemoryChunk(byte *data);
         Chunk *subBlock();
+        void reseek();
         bool read(void *buffer, uint32 size);
         int8 getChar();
         byte getByte();

smush_player.cpp

@@ -892 +892 @@
 
         while (!b.eof()) {
                 Chunk *sub = b.subBlock();
-                if (sub->getSize() & 1) b.seek(1);
                 switch (sub->getType()) {
                 case TYPE_NPAL:
                         handleNewPalette(*sub);
@@ -942 +941 @@
                 default:
                         error("Unknown frame subChunk found : %s, %d", Chunk::ChunkString(sub->getType()), sub->getSize());
                 }
+
+                b.reseek();
+                if (sub->getSize() & 1)
+                        b.seek(1);
+
                 delete sub;
         }
 
@@ -1085 +1089 @@
         }
         delete sub;
 
+        _base->reseek();
+
         if (_insanity)
                 _vm->_sound->processSound();