ScummVM/scummvm-tools
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm-tools.git synced 2026-05-21 05:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

MADS: Switch from libblast to common/dcl

Browse Source
This commit is contained in:
Vladimir Serbinenko
2022-11-18 16:59:36 +01:00
committed by Eugene Sandulenko
parent 7b9337fe2b
commit 3aa7ad671d
2 changed files with 6 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.common
+1 -1
View File
@@ -172,7 +172,7 @@ extract_lokalizator_OBJS := \
extract_mps_OBJS := \
engines/mads/extract_mps.o \
engines/mads/libblast/blast.o \
common/dcl.o \
$(UTILS)
deprince_OBJS := \
engines/mads/extract_mps.cpp
+5 -37
View File
@@ -20,9 +20,10 @@
*/
#include "common/endian.h"
#include "common/memstream.h"
#include "common/str.h"
#include "common/util.h"
#include "libblast/blast.h"
#include "common/dcl.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -37,37 +38,6 @@ struct FileDescriptorBin {
uint32 uncompressedSize;
} __attribute__ ((packed));
struct blastMemInputWrapperStruct {
uint32 _offset, _len;
byte *_data;
blastMemInputWrapperStruct() : _len(0), _offset(0), _data(nullptr) {}
blastMemInputWrapperStruct(byte *data, uint32 len) : _len(len), _offset(0), _data(data) {}
};
uint blastMemInputWrapper(void *how, byte **buf) {
struct blastMemInputWrapperStruct *ctx = (struct blastMemInputWrapperStruct *) how;
*buf = ctx->_data + ctx->_offset;
uint avail = ctx->_len - ctx->_offset;
ctx->_offset += avail;
return avail;
}
struct blastMemOutputWrapperStruct {
uint32 _written, _bufLen;
byte *_data;
blastMemOutputWrapperStruct() : _bufLen(0), _written(0), _data(nullptr) {}
blastMemOutputWrapperStruct(byte *data, uint32 len) : _bufLen(len), _written(0), _data(data) {}
};
int blastMemOutputWrapper(void *how, byte *buf, uint len) {
struct blastMemOutputWrapperStruct *ctx = (struct blastMemOutputWrapperStruct *) how;
if (len + ctx->_written > ctx->_bufLen)
return 1;
memcpy(ctx->_data + ctx->_written, buf, len);
ctx->_written += len;
return 0;
}
int main (int argc, char **argv) {
unsigned char * buf;
size_t indexSize;
@@ -141,12 +111,10 @@ int main (int argc, char **argv) {
uncompressedSize = compressedSize;
break;
case 1:
blastMemInputWrapperStruct blastInput(compressedBuf, compressedSize);
Common::MemoryReadStream compressedReadStream(compressedBuf, compressedSize);
uncompressedBuf = new byte[uncompressedSize];
blastMemOutputWrapperStruct blastOutput(uncompressedBuf, uncompressedSize);
BlastError blastErr = blast(blastMemInputWrapper, &blastInput, blastMemOutputWrapper, &blastOutput, nullptr, nullptr);
if (blastErr) {
fprintf (stderr, "Unable to decompress %s: %d\n", descBin->name, blastErr);
if (!Common::decompressDCL(&compressedReadStream, uncompressedBuf, compressedSize, uncompressedSize)) {
fprintf (stderr, "Unable to decompress %s\n", descBin->name);
continue;
}