summaryrefslogtreecommitdiff
path: root/noncore/apps/opie-reader/decompress.cpp
Unidiff
Diffstat (limited to 'noncore/apps/opie-reader/decompress.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-reader/decompress.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/noncore/apps/opie-reader/decompress.cpp b/noncore/apps/opie-reader/decompress.cpp
index 9bfec49..6034e01 100644
--- a/noncore/apps/opie-reader/decompress.cpp
+++ b/noncore/apps/opie-reader/decompress.cpp
@@ -3,40 +3,33 @@
3#include <zlib.h> 3#include <zlib.h>
4#include <stdlib.h> 4#include <stdlib.h>
5 5
6size_t UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuffer, size_t bsize) 6size_t UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuffer, size_t bsize)
7{ 7{
8 z_stream zstream; 8 z_stream zstream;
9 memset(&zstream,sizeof(zstream),0); 9 memset(&zstream,sizeof(zstream),0);
10 zstream.next_in = compressedbuffer; 10 zstream.next_in = compressedbuffer;
11 zstream.next_out = tgtbuffer; 11 zstream.next_out = tgtbuffer;
12 zstream.avail_out = bsize; 12 zstream.avail_out = bsize;
13 zstream.avail_in = reclen; 13 zstream.avail_in = reclen;
14 14
15 int keylen = 0;
16
17 zstream.zalloc = Z_NULL; 15 zstream.zalloc = Z_NULL;
18 zstream.zfree = Z_NULL; 16 zstream.zfree = Z_NULL;
19 zstream.opaque = Z_NULL; 17 zstream.opaque = Z_NULL;
20 18
21 // printf("Initialising\n"); 19 // printf("Initialising\n");
22 20
23 inflateInit(&zstream); 21 inflateInit(&zstream);
24 int err = 0; 22 int err = 0;
25 do { 23 do {
26 if ( zstream.avail_in == 0 && 0 < keylen ) {
27 zstream.next_in = compressedbuffer + keylen;
28 zstream.avail_in = reclen - keylen;
29 keylen = 0;
30 }
31 zstream.next_out = tgtbuffer; 24 zstream.next_out = tgtbuffer;
32 zstream.avail_out = bsize; 25 zstream.avail_out = bsize;
33 26
34 err = inflate( &zstream, Z_SYNC_FLUSH ); 27 err = inflate( &zstream, Z_SYNC_FLUSH );
35 28
36 ////qDebug("err:%d - %u", err, zstream.avail_in); 29 ////qDebug("err:%d - %u", err, zstream.avail_in);
37 30
38 } while ( err == Z_OK ); 31 } while ( err == Z_OK );
39 32
40 inflateEnd(&zstream); 33 inflateEnd(&zstream);
41 return zstream.total_out; 34 return zstream.total_out;
42} 35}