mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-25 13:31:37 +00:00
- Found a copy of PKZIP 1.1 and verified that Implode support works with
files that use a literal table and 8k dictionary, and that the just-added Shrink support works at all. - Replaced the bit-at-a-time Shannon-Fano decoder from GunZip.c64 with the word-at-a-time one from 7-Zip for a slight speedup when working with Imploded files. SVN r1588 (trunk)
This commit is contained in:
Randy Heit
parent
b55ca6ffaa
commit
cef12aac6d
5 changed files with 268 additions and 177 deletions
|
|
@ -1,4 +1,11 @@
|
|||
May 15, 2009 (Changes by Graf Zahl)
|
||||
May 15, 2009
|
||||
- Found a copy of PKZIP 1.1 and verified that Implode support works with
|
||||
files that use a literal table and 8k dictionary, and that the just-added
|
||||
Shrink support works at all.
|
||||
- Replaced the bit-at-a-time Shannon-Fano decoder from GunZip.c64 with the
|
||||
word-at-a-time one from 7-Zip.
|
||||
|
||||
May 15, 2009 (Changes by Graf Zahl)
|
||||
- Fixed: Monsters should not check the inventory for damage absorbtion when
|
||||
they have the MF5_NODAMAGE flag set.
|
||||
- Added patch for saving automap zoom.
|
||||
|
|
|
|||
|
|
@ -14,6 +14,40 @@
|
|||
#include <stdlib.h>
|
||||
#include "explode.h"
|
||||
|
||||
static const unsigned char BitReverse[] = {
|
||||
0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
|
||||
0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
|
||||
0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
|
||||
0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
|
||||
0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
|
||||
0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
|
||||
0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
|
||||
0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
|
||||
0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
|
||||
0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
|
||||
0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
|
||||
0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
|
||||
0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
|
||||
0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
|
||||
0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
|
||||
0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
|
||||
0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
|
||||
0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
|
||||
0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
|
||||
0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
|
||||
0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
|
||||
0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
|
||||
0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
|
||||
0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
|
||||
0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
|
||||
0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
|
||||
0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
|
||||
0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
|
||||
0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
|
||||
0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
|
||||
0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
|
||||
0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff
|
||||
};
|
||||
|
||||
/****************************************************************
|
||||
Bit-I/O variables and routines/macros
|
||||
|
|
@ -31,24 +65,20 @@
|
|||
|
||||
****************************************************************/
|
||||
|
||||
int FZipExploder::READBYTE()
|
||||
{
|
||||
if (InLeft)
|
||||
{
|
||||
unsigned char c;
|
||||
InLeft--;
|
||||
if (1 != In->Read(&c, 1))
|
||||
throw CExplosionError("Out of input");
|
||||
return c;
|
||||
}
|
||||
throw CExplosionError("Out of input");
|
||||
}
|
||||
#define READBYTE(c) \
|
||||
do { \
|
||||
c = 0; \
|
||||
if (InLeft) { \
|
||||
InLeft--; \
|
||||
In->Read(&c, 1); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
/* Get a byte of input into the bit accumulator, or return from inflate()
|
||||
if there is no input available. */
|
||||
/* Get a byte of input into the bit accumulator. */
|
||||
#define PULLBYTE() \
|
||||
do { \
|
||||
int next = READBYTE(); \
|
||||
unsigned char next; \
|
||||
READBYTE(next); \
|
||||
Hold += (unsigned int)(next) << Bits; \
|
||||
Bits += 8; \
|
||||
} while (0)
|
||||
|
|
@ -78,126 +108,84 @@ int FZipExploder::READBYTE()
|
|||
DROPBITS(a); \
|
||||
} while (0)
|
||||
|
||||
int FZipExploder::IsPat()
|
||||
|
||||
/* SetCodeLengths() and DecodeSFValue() are from 7-Zip, which is LGPL. */
|
||||
|
||||
bool FZipExploder::DecoderBase::SetCodeLengths(const Byte *codeLengths, const int kNumSymbols)
|
||||
{
|
||||
for(;;)
|
||||
{
|
||||
if (fpos[len] >= fmax)
|
||||
return -1;
|
||||
if (flens[fpos[len]] == len)
|
||||
return fpos[len]++;
|
||||
fpos[len]++;
|
||||
}
|
||||
int lenCounts[kNumBitsInLongestCode + 2], tmpPositions[kNumBitsInLongestCode + 1];
|
||||
int i;
|
||||
for(i = 0; i <= kNumBitsInLongestCode; i++)
|
||||
lenCounts[i] = 0;
|
||||
int symbolIndex;
|
||||
for (symbolIndex = 0; symbolIndex < kNumSymbols; symbolIndex++)
|
||||
lenCounts[codeLengths[symbolIndex]]++;
|
||||
|
||||
Limits[kNumBitsInLongestCode + 1] = 0;
|
||||
Positions[kNumBitsInLongestCode + 1] = 0;
|
||||
lenCounts[kNumBitsInLongestCode + 1] = 0;
|
||||
|
||||
int startPos = 0;
|
||||
static const UInt32 kMaxValue = (1 << kNumBitsInLongestCode);
|
||||
|
||||
for (i = kNumBitsInLongestCode; i > 0; i--)
|
||||
{
|
||||
startPos += lenCounts[i] << (kNumBitsInLongestCode - i);
|
||||
if (startPos > kMaxValue)
|
||||
return false;
|
||||
Limits[i] = startPos;
|
||||
Positions[i] = Positions[i + 1] + lenCounts[i + 1];
|
||||
tmpPositions[i] = Positions[i] + lenCounts[i];
|
||||
}
|
||||
|
||||
if (startPos != kMaxValue)
|
||||
return false;
|
||||
|
||||
for (symbolIndex = 0; symbolIndex < kNumSymbols; symbolIndex++)
|
||||
if (codeLengths[symbolIndex] != 0)
|
||||
Symbols[--tmpPositions[codeLengths[symbolIndex]]] = symbolIndex;
|
||||
return true;
|
||||
}
|
||||
|
||||
int FZipExploder::DecodeSFValue(const DecoderBase &decoder, const unsigned int kNumSymbols)
|
||||
{
|
||||
unsigned int numBits = 0;
|
||||
unsigned int value;
|
||||
int i;
|
||||
NEEDBITS(kNumBitsInLongestCode);
|
||||
// value = BITS(kNumBitsInLongestCode);
|
||||
// TODO: Rewrite this so it doesn't need the BitReverse table.
|
||||
// (It should be possible, right?)
|
||||
value = (BitReverse[Hold & 0xFF] << 8) | BitReverse[(Hold >> 8) & 0xFF];
|
||||
for(i = kNumBitsInLongestCode; i > 0; i--)
|
||||
{
|
||||
if (value < decoder.Limits[i])
|
||||
{
|
||||
numBits = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i == 0)
|
||||
return -1;
|
||||
DROPBITS(numBits);
|
||||
unsigned int index = decoder.Positions[numBits] +
|
||||
((value - decoder.Limits[numBits + 1]) >> (kNumBitsInLongestCode - numBits));
|
||||
if (index >= kNumSymbols)
|
||||
return -1;
|
||||
return decoder.Symbols[index];
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
A recursive routine which creates the Huffman decode tables
|
||||
|
||||
No presorting of code lengths are needed, because a counting
|
||||
sort is perfomed on the fly.
|
||||
*/
|
||||
|
||||
/* Maximum recursion depth is equal to the maximum
|
||||
Huffman code length, which is 15 in the deflate algorithm.
|
||||
(16 in Inflate!) */
|
||||
int FZipExploder::Rec()
|
||||
int FZipExploder::DecodeSF(unsigned char *table)
|
||||
{
|
||||
struct HufNode *curplace = Places;
|
||||
int tmp;
|
||||
|
||||
if(len == 17)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
Places++;
|
||||
len++;
|
||||
|
||||
tmp = IsPat();
|
||||
if(tmp >= 0) {
|
||||
curplace->b0 = tmp; /* leaf cell for 0-bit */
|
||||
} else {
|
||||
/* Not a Leaf cell */
|
||||
curplace->b0 = 0x8000;
|
||||
if(Rec())
|
||||
return -1;
|
||||
}
|
||||
tmp = IsPat();
|
||||
if(tmp >= 0) {
|
||||
curplace->b1 = tmp; /* leaf cell for 1-bit */
|
||||
curplace->jump = NULL; /* Just for the display routine */
|
||||
} else {
|
||||
/* Not a Leaf cell */
|
||||
curplace->b1 = 0x8000;
|
||||
curplace->jump = Places;
|
||||
if(Rec())
|
||||
return -1;
|
||||
}
|
||||
len--;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* In C64 return the most significant bit in Carry */
|
||||
/* The same as DecodeValue(), except that 0/1 is reversed */
|
||||
int FZipExploder::DecodeSFValue(struct HufNode *currentTree)
|
||||
{
|
||||
struct HufNode *X = currentTree;
|
||||
int c;
|
||||
|
||||
/* decode one symbol of the data */
|
||||
for(;;)
|
||||
{
|
||||
READBITS(c, 1);
|
||||
if(!c) { /* Only the decision is reversed! */
|
||||
if(!(X->b1 & 0x8000))
|
||||
return X->b1; /* If leaf node, return data */
|
||||
X = X->jump;
|
||||
} else {
|
||||
if(!(X->b0 & 0x8000))
|
||||
return X->b0; /* If leaf node, return data */
|
||||
X++;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
Note:
|
||||
The tree create and distance code trees <= 32 entries
|
||||
and could be represented with the shorter tree algorithm.
|
||||
I.e. use a X/Y-indexed table for each struct member.
|
||||
*/
|
||||
int FZipExploder::CreateTree(struct HufNode *currentTree, int numval, int *lengths)
|
||||
{
|
||||
int i;
|
||||
|
||||
/* Create the Huffman decode tree/table */
|
||||
Places = currentTree;
|
||||
flens = lengths;
|
||||
fmax = numval;
|
||||
for (i=0;i<17;i++)
|
||||
fpos[i] = 0;
|
||||
len = 0;
|
||||
if(Rec()) {
|
||||
/* fprintf(stderr, "invalid huffman tree\n");*/
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* fprintf(stderr, "%d table entries used (max code length %d)\n",
|
||||
Places-currentTree, maxlen);*/
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int FZipExploder::DecodeSF(int *table)
|
||||
{
|
||||
int i, a, n = READBYTE() + 1, v = 0;
|
||||
unsigned char a, c;
|
||||
int i, n, v = 0;
|
||||
|
||||
READBYTE(c);
|
||||
n = c + 1;
|
||||
for (i = 0; i < n; i++) {
|
||||
int nv, bl;
|
||||
a = READBYTE();
|
||||
READBYTE(a);
|
||||
nv = ((a >> 4) & 15) + 1;
|
||||
bl = (a & 15) + 1;
|
||||
while (nv--) {
|
||||
|
|
@ -207,16 +195,13 @@ int FZipExploder::DecodeSF(int *table)
|
|||
return v; /* entries used */
|
||||
}
|
||||
|
||||
/* Note: Imploding could use the lighter huffman tree routines, as the
|
||||
max number of entries is 256. But too much code would need to
|
||||
be duplicated.
|
||||
*/
|
||||
int FZipExploder::Explode(unsigned char *out, unsigned int outsize,
|
||||
FileReader *in, unsigned int insize,
|
||||
int flags)
|
||||
{
|
||||
int c, i, minMatchLen = 3, len, dist;
|
||||
int ll[256];
|
||||
int lowDistanceBits;
|
||||
unsigned char ll[256];
|
||||
unsigned int bIdx = 0;
|
||||
|
||||
Hold = 0;
|
||||
|
|
@ -227,41 +212,34 @@ int FZipExploder::Explode(unsigned char *out, unsigned int outsize,
|
|||
if ((flags & 4)) {
|
||||
/* 3 trees: literals, lengths, distance top 6 */
|
||||
minMatchLen = 3;
|
||||
if (CreateTree(LiteralTree, DecodeSF(ll), ll))
|
||||
if (!LiteralDecoder.SetCodeLengths(ll, DecodeSF(ll)))
|
||||
return 1;
|
||||
} else {
|
||||
/* 2 trees: lengths, distance top 6 */
|
||||
minMatchLen = 2;
|
||||
}
|
||||
if (CreateTree(LengthTree, DecodeSF(ll), ll))
|
||||
if (!LengthDecoder.SetCodeLengths(ll, DecodeSF(ll)))
|
||||
return 1;
|
||||
if (CreateTree(DistanceTree, DecodeSF(ll), ll))
|
||||
if (!DistanceDecoder.SetCodeLengths(ll, DecodeSF(ll)))
|
||||
return 1;
|
||||
|
||||
lowDistanceBits = (flags & 2) ? /* 8k dictionary */ 7 : /* 4k dictionary */ 6;
|
||||
while (bIdx < outsize)
|
||||
{
|
||||
READBITS(c, 1);
|
||||
if (c) {
|
||||
/* literal data */
|
||||
if ((flags & 4)) {
|
||||
c = DecodeSFValue(LiteralTree);
|
||||
c = DecodeSFValue(LiteralDecoder, 256);
|
||||
} else {
|
||||
READBITS(c, 8);
|
||||
}
|
||||
out[bIdx++] = c;
|
||||
} else {
|
||||
if ((flags & 2)) {
|
||||
/* 8k dictionary */
|
||||
READBITS(dist, 7);
|
||||
c = DecodeSFValue(DistanceTree);
|
||||
dist |= (c<<7);
|
||||
} else {
|
||||
/* 4k dictionary */
|
||||
READBITS(dist, 6);
|
||||
c = DecodeSFValue(DistanceTree);
|
||||
dist |= (c<<6);
|
||||
}
|
||||
len = DecodeSFValue(LengthTree);
|
||||
READBITS(dist, lowDistanceBits);
|
||||
c = DecodeSFValue(DistanceDecoder, 64);
|
||||
dist |= (c << lowDistanceBits);
|
||||
len = DecodeSFValue(LengthDecoder, 64);
|
||||
if (len == 63) {
|
||||
READBITS(c, 8);
|
||||
len += c;
|
||||
|
|
@ -287,3 +265,106 @@ int FZipExploder::Explode(unsigned char *out, unsigned int outsize,
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* HSIZE is defined as 2^13 (8192) in unzip.h */
|
||||
#define HSIZE 8192
|
||||
#define BOGUSCODE 256
|
||||
#define CODE_MASK (HSIZE - 1) /* 0x1fff (lower bits are parent's index) */
|
||||
#define FREE_CODE HSIZE /* 0x2000 (code is unused or was cleared) */
|
||||
#define HAS_CHILD (HSIZE << 1) /* 0x4000 (code has a child--do not clear) */
|
||||
|
||||
int ShrinkLoop(unsigned char *out, unsigned int outsize,
|
||||
FileReader *In, unsigned int InLeft)
|
||||
{
|
||||
unsigned short Parent[HSIZE];
|
||||
unsigned char Value[HSIZE], Stack[HSIZE];
|
||||
unsigned char *newstr;
|
||||
int len;
|
||||
int KwKwK, codesize = 9; /* start at 9 bits/code */
|
||||
int code, oldcode, freecode, curcode;
|
||||
unsigned int Bits = 0, Hold = 0;
|
||||
unsigned int size = 0;
|
||||
|
||||
freecode = BOGUSCODE;
|
||||
for (code = 0; code < BOGUSCODE; code++)
|
||||
{
|
||||
Value[code] = code;
|
||||
Parent[code] = BOGUSCODE;
|
||||
}
|
||||
for (code = BOGUSCODE+1; code < HSIZE; code++)
|
||||
Parent[code] = FREE_CODE;
|
||||
|
||||
READBITS(oldcode, codesize);
|
||||
if (size < outsize) {
|
||||
out[size++] = oldcode;
|
||||
}
|
||||
|
||||
while (size < outsize)
|
||||
{
|
||||
READBITS(code, codesize);
|
||||
if (code == BOGUSCODE) { /* possible to have consecutive escapes? */
|
||||
READBITS(code, codesize);
|
||||
if (code == 1) {
|
||||
codesize++;
|
||||
} else if (code == 2) {
|
||||
/* clear leafs (nodes with no children) */
|
||||
/* first loop: mark each parent as such */
|
||||
for (code = BOGUSCODE+1; code < HSIZE; ++code) {
|
||||
curcode = (Parent[code] & CODE_MASK);
|
||||
|
||||
if (curcode > BOGUSCODE)
|
||||
Parent[curcode] |= HAS_CHILD; /* set parent's child-bit */
|
||||
}
|
||||
|
||||
/* second loop: clear all nodes *not* marked as parents; reset flag bits */
|
||||
for (code = BOGUSCODE+1; code < HSIZE; ++code) {
|
||||
if (Parent[code] & HAS_CHILD) { /* just clear child-bit */
|
||||
Parent[code] &= ~HAS_CHILD;
|
||||
} else { /* leaf: lose it */
|
||||
Parent[code] = FREE_CODE;
|
||||
}
|
||||
}
|
||||
freecode = BOGUSCODE;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
newstr = &Stack[HSIZE-1];
|
||||
curcode = code;
|
||||
|
||||
if (Parent[curcode] == FREE_CODE) {
|
||||
KwKwK = 1;
|
||||
newstr--; /* last character will be same as first character */
|
||||
curcode = oldcode;
|
||||
len = 1;
|
||||
} else {
|
||||
KwKwK = 0;
|
||||
len = 0;
|
||||
}
|
||||
|
||||
do {
|
||||
*newstr-- = Value[curcode];
|
||||
len++;
|
||||
curcode = (Parent[curcode] & CODE_MASK);
|
||||
} while (curcode != BOGUSCODE);
|
||||
|
||||
newstr++;
|
||||
if (KwKwK) {
|
||||
Stack[HSIZE-1] = *newstr;
|
||||
}
|
||||
|
||||
do {
|
||||
freecode++;
|
||||
} while (Parent[freecode] != FREE_CODE);
|
||||
|
||||
Parent[freecode] = oldcode;
|
||||
Value[freecode] = *newstr;
|
||||
oldcode = code;
|
||||
|
||||
while (len--) {
|
||||
out[size++] = *newstr++;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,40 +7,33 @@ class FZipExploder
|
|||
FileReader *In;
|
||||
unsigned int InLeft;
|
||||
|
||||
int READBYTE();
|
||||
|
||||
/****************************************************************
|
||||
Huffman tree structures, variables and related routines
|
||||
|
||||
These routines are one-bit-at-a-time decode routines. They
|
||||
are not as fast as multi-bit routines, but maybe a bit easier
|
||||
to understand and use a lot less memory.
|
||||
|
||||
The tree is folded into a table.
|
||||
|
||||
Shannon-Fano tree structures, variables and related routines
|
||||
****************************************************************/
|
||||
|
||||
struct HufNode {
|
||||
unsigned short b0; /* 0-branch value + leaf node flag */
|
||||
unsigned short b1; /* 1-branch value + leaf node flag */
|
||||
struct HufNode *jump; /* 1-branch jump address */
|
||||
enum { kNumBitsInLongestCode = 16 };
|
||||
|
||||
struct DecoderBase
|
||||
{
|
||||
unsigned int Limits[kNumBitsInLongestCode + 2]; // Limits[i] = value limit for symbols with length = i
|
||||
unsigned char Positions[kNumBitsInLongestCode + 2]; // Positions[i] = index in Symbols[] of first symbol with length = i
|
||||
unsigned char Symbols[1];
|
||||
|
||||
bool SetCodeLengths(const unsigned char *codeLengths, const int kNumSymbols);
|
||||
};
|
||||
|
||||
struct HufNode LiteralTree[256];
|
||||
struct HufNode DistanceTree[64];
|
||||
struct HufNode LengthTree[64];
|
||||
struct HufNode *Places;
|
||||
template<int kNumSymbols>
|
||||
struct Decoder : DecoderBase
|
||||
{
|
||||
unsigned char RestOfSymbols[kNumSymbols];
|
||||
};
|
||||
|
||||
unsigned char len;
|
||||
short fpos[17];
|
||||
int *flens;
|
||||
short fmax;
|
||||
Decoder<256> LiteralDecoder;
|
||||
Decoder<64> DistanceDecoder;
|
||||
Decoder<64> LengthDecoder;
|
||||
|
||||
int IsPat();
|
||||
int Rec();
|
||||
int DecodeSFValue(struct HufNode *currentTree);
|
||||
int CreateTree(struct HufNode *currentTree, int numval, int *lengths);
|
||||
int DecodeSF(int *table);
|
||||
int DecodeSFValue(const DecoderBase ¤tTree, const unsigned int kNumSymbols);
|
||||
int DecodeSF(unsigned char *table);
|
||||
public:
|
||||
int Explode(unsigned char *out, unsigned int outsize, FileReader *in, unsigned int insize, int flags);
|
||||
};
|
||||
|
|
@ -50,3 +43,5 @@ class CExplosionError : CRecoverableError
|
|||
public:
|
||||
CExplosionError(const char *message) : CRecoverableError(message) {}
|
||||
};
|
||||
|
||||
int ShrinkLoop(unsigned char *out, unsigned int outsize, FileReader *in, unsigned int insize);
|
||||
|
|
@ -233,7 +233,8 @@ bool FZipFile::Open()
|
|||
zip_fh->Method != METHOD_DEFLATE &&
|
||||
zip_fh->Method != METHOD_LZMA &&
|
||||
zip_fh->Method != METHOD_BZIP2 &&
|
||||
zip_fh->Method != METHOD_IMPLODE)
|
||||
zip_fh->Method != METHOD_IMPLODE &&
|
||||
zip_fh->Method != METHOD_SHRINK)
|
||||
{
|
||||
Printf("\n%s: '%s' uses an unsupported compression algorithm (#%d).\n", Filename, name, zip_fh->Method);
|
||||
skipped++;
|
||||
|
|
@ -384,6 +385,12 @@ int FZipLump::FillCache()
|
|||
break;
|
||||
}
|
||||
|
||||
case METHOD_SHRINK:
|
||||
{
|
||||
ShrinkLoop((unsigned char *)Cache, LumpSize, Owner->Reader, LumpSize);
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
assert(0);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -63,6 +63,7 @@ struct FZipLocalFileHeader
|
|||
#define ZIP_ENDOFDIR MAKE_ID('P','K',5,6)
|
||||
|
||||
#define METHOD_STORED 0
|
||||
#define METHOD_SHRINK 1
|
||||
#define METHOD_IMPLODE 6
|
||||
#define METHOD_DEFLATE 8
|
||||
#define METHOD_BZIP2 12
|
||||
|
|
|
|||
Loading…
Reference in a new issue