projects/ldc: lphobos/std/zlib.d annotate

annotate lphobos/std/zlib.d @ 650:aa6a0b7968f7

Added test case for bug #100 Removed dubious check for not emitting static private global in other modules without access. This should be handled properly somewhere else, it's causing unresolved global errors for stuff that should work (in MiniD)

author	Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date	Sun, 05 Oct 2008 17:28:15 +0200
parents	373489eeaf90
children

rev	line source
473 373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	1 /**
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	2 * Compress/decompress data using the $(LINK2 http://www._zlib.net, zlib library).
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	3 *
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	4 * References:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	5 * $(LINK2 http://en.wikipedia.org/wiki/Zlib, Wikipedia)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	6 * License:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	7 * Public Domain
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	8 *
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	9 * Macros:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	10 * WIKI = Phobos/StdZlib
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	11 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	12
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	13 /* NOTE: This file has been patched from the original DMD distribution to
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	14 work with the GDC compiler.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	15
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	16 Modified by David Friedman, February 2007
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	17 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	18
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	19 module std.zlib;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	20
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	21 //debug=zlib; // uncomment to turn on debugging printf's
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	22
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	23 private import etc.c.zlib, std.stdint;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	24
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	25 // Values for 'mode'
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	26
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	27 enum
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	28 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	29 Z_NO_FLUSH = 0,
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	30 Z_SYNC_FLUSH = 2,
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	31 Z_FULL_FLUSH = 3,
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	32 Z_FINISH = 4,
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	33 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	34
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	35 /*************************************
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	36 * Errors throw a ZlibException.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	37 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	38
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	39 class ZlibException : Exception
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	40 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	41 this(int errnum)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	42 { char[] msg;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	43
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	44 switch (errnum)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	45 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	46 case Z_STREAM_END: msg = "stream end"; break;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	47 case Z_NEED_DICT: msg = "need dict"; break;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	48 case Z_ERRNO: msg = "errno"; break;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	49 case Z_STREAM_ERROR: msg = "stream error"; break;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	50 case Z_DATA_ERROR: msg = "data error"; break;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	51 case Z_MEM_ERROR: msg = "mem error"; break;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	52 case Z_BUF_ERROR: msg = "buf error"; break;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	53 case Z_VERSION_ERROR: msg = "version error"; break;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	54 default: msg = "unknown error"; break;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	55 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	56 super(msg);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	57 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	58 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	59
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	60 /**************************************************
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	61 * Compute the Adler32 checksum of the data in buf[]. adler is the starting
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	62 * value when computing a cumulative checksum.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	63 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	64
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	65 uint adler32(uint adler, void[] buf)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	66 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	67 return etc.c.zlib.adler32(adler, cast(ubyte *)buf, buf.length);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	68 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	69
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	70 unittest
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	71 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	72 static ubyte[] data = [1,2,3,4,5,6,7,8,9,10];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	73
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	74 uint adler;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	75
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	76 debug(zlib) printf("D.zlib.adler32.unittest\n");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	77 adler = adler32(0u, cast(void[])data);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	78 debug(zlib) printf("adler = %x\n", adler);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	79 assert(adler == 0xdc0037);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	80 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	81
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	82 /*********************************
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	83 * Compute the CRC32 checksum of the data in buf[]. crc is the starting value
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	84 * when computing a cumulative checksum.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	85 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	86
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	87 uint crc32(uint crc, void[] buf)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	88 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	89 return etc.c.zlib.crc32(crc, cast(ubyte *)buf, buf.length);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	90 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	91
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	92 unittest
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	93 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	94 static ubyte[] data = [1,2,3,4,5,6,7,8,9,10];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	95
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	96 uint crc;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	97
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	98 debug(zlib) printf("D.zlib.crc32.unittest\n");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	99 crc = crc32(0u, cast(void[])data);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	100 debug(zlib) printf("crc = %x\n", crc);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	101 assert(crc == 0x2520577b);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	102 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	103
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	104 /*********************************************
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	105 * Compresses the data in srcbuf[] using compression _level level.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	106 * The default value
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	107 * for level is 6, legal values are 1..9, with 1 being the least compression
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	108 * and 9 being the most.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	109 * Returns the compressed data.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	110 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	111
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	112 void[] compress(void[] srcbuf, int level)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	113 in
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	114 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	115 assert(-1 <= level && level <= 9);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	116 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	117 body
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	118 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	119 int err;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	120 ubyte[] destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	121 Culong_t destlen;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	122
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	123 destlen = srcbuf.length + ((srcbuf.length + 1023) / 1024) + 12;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	124 destbuf = new ubyte[destlen];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	125 err = etc.c.zlib.compress2(destbuf.ptr, &destlen, cast(ubyte *)srcbuf, srcbuf.length, level);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	126 if (err)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	127 { delete destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	128 throw new ZlibException(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	129 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	130
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	131 destbuf.length = destlen;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	132 return destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	133 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	134
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	135 /*********************************************
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	136 * ditto
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	137 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	138
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	139 void[] compress(void[] buf)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	140 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	141 return compress(buf, Z_DEFAULT_COMPRESSION);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	142 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	143
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	144 /*********************************************
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	145 * Decompresses the data in srcbuf[].
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	146 * Params: destlen = size of the uncompressed data.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	147 * It need not be accurate, but the decompression will be faster if the exact
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	148 * size is supplied.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	149 * Returns: the decompressed data.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	150 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	151
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	152 void[] uncompress(void[] srcbuf, size_t destlen = 0u, int winbits = 15)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	153 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	154 int err;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	155 ubyte[] destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	156
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	157 if (!destlen)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	158 destlen = srcbuf.length * 2 + 1;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	159
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	160 while (1)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	161 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	162 etc.c.zlib.z_stream zs;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	163
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	164 destbuf = new ubyte[destlen];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	165
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	166 zs.next_in = cast(ubyte*) srcbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	167 zs.avail_in = srcbuf.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	168
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	169 zs.next_out = destbuf.ptr;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	170 zs.avail_out = destlen;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	171
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	172 err = etc.c.zlib.inflateInit2(&zs, winbits);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	173 if (err)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	174 { delete destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	175 throw new ZlibException(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	176 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	177 err = etc.c.zlib.inflate(&zs, Z_NO_FLUSH);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	178 switch (err)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	179 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	180 case Z_OK:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	181 etc.c.zlib.inflateEnd(&zs);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	182 destlen = destbuf.length * 2;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	183 continue;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	184
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	185 case Z_STREAM_END:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	186 destbuf.length = zs.total_out;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	187 err = etc.c.zlib.inflateEnd(&zs);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	188 if (err != Z_OK)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	189 goto Lerr;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	190 return destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	191
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	192 default:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	193 etc.c.zlib.inflateEnd(&zs);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	194 Lerr:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	195 delete destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	196 throw new ZlibException(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	197 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	198 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	199 assert(0);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	200 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	201
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	202 unittest
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	203 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	204 ubyte[] src = cast(ubyte[])
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	205 "the quick brown fox jumps over the lazy dog\r
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	206 the quick brown fox jumps over the lazy dog\r
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	207 ";
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	208 ubyte[] dst;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	209 ubyte[] result;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	210
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	211 //arrayPrint(src);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	212 dst = cast(ubyte[])compress(cast(void[])src);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	213 //arrayPrint(dst);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	214 result = cast(ubyte[])uncompress(cast(void[])dst);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	215 //arrayPrint(result);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	216 assert(result == src);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	217 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	218
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	219 /+
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	220 void arrayPrint(ubyte[] array)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	221 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	222 //printf("array %p,%d\n", (void*)array, array.length);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	223 for (int i = 0; i < array.length; i++)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	224 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	225 printf("%02x ", array[i]);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	226 if (((i + 1) & 15) == 0)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	227 printf("\n");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	228 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	229 printf("\n\n");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	230 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	231 +/
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	232
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	233 /*********************************************
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	234 * Used when the data to be compressed is not all in one buffer.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	235 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	236
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	237 class Compress
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	238 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	239 private:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	240 z_stream zs;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	241 int level = Z_DEFAULT_COMPRESSION;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	242 int inited;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	243
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	244 void error(int err)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	245 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	246 if (inited)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	247 { deflateEnd(&zs);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	248 inited = 0;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	249 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	250 throw new ZlibException(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	251 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	252
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	253 public:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	254
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	255 /**
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	256 * Construct. level is the same as for D.zlib.compress().
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	257 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	258 this(int level)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	259 in
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	260 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	261 assert(1 <= level && level <= 9);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	262 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	263 body
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	264 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	265 this.level = level;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	266 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	267
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	268 /// ditto
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	269 this()
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	270 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	271 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	272
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	273 ~this()
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	274 { int err;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	275
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	276 if (inited)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	277 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	278 inited = 0;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	279 err = deflateEnd(&zs);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	280 if (err)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	281 error(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	282 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	283 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	284
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	285 /**
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	286 * Compress the data in buf and return the compressed data.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	287 * The buffers
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	288 * returned from successive calls to this should be concatenated together.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	289 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	290 void[] compress(void[] buf)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	291 { int err;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	292 ubyte[] destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	293
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	294 if (buf.length == 0)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	295 return null;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	296
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	297 if (!inited)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	298 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	299 err = deflateInit(&zs, level);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	300 if (err)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	301 error(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	302 inited = 1;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	303 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	304
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	305 destbuf = new ubyte[zs.avail_in + buf.length];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	306 zs.next_out = destbuf.ptr;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	307 zs.avail_out = destbuf.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	308
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	309 if (zs.avail_in)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	310 buf = cast(void[])zs.next_in[0 .. zs.avail_in] ~ buf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	311
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	312 zs.next_in = cast(ubyte*) buf.ptr;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	313 zs.avail_in = buf.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	314
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	315 err = deflate(&zs, Z_NO_FLUSH);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	316 if (err != Z_STREAM_END && err != Z_OK)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	317 { delete destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	318 error(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	319 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	320 destbuf.length = destbuf.length - zs.avail_out;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	321 return destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	322 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	323
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	324 /***
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	325 * Compress and return any remaining data.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	326 * The returned data should be appended to that returned by compress().
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	327 * Params:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	328 * mode = one of the following:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	329 * $(DL
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	330 $(DT Z_SYNC_FLUSH )
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	331 $(DD Syncs up flushing to the next byte boundary.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	332 Used when more data is to be compressed later on.)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	333 $(DT Z_FULL_FLUSH )
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	334 $(DD Syncs up flushing to the next byte boundary.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	335 Used when more data is to be compressed later on,
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	336 and the decompressor needs to be restartable at this
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	337 point.)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	338 $(DT Z_FINISH)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	339 $(DD (default) Used when finished compressing the data. )
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	340 )
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	341 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	342 void[] flush(int mode = Z_FINISH)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	343 in
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	344 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	345 assert(mode == Z_FINISH \|\| mode == Z_SYNC_FLUSH \|\| mode == Z_FULL_FLUSH);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	346 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	347 body
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	348 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	349 void[] destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	350 ubyte[512] tmpbuf = void;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	351 int err;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	352
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	353 if (!inited)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	354 return null;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	355
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	356 /* may be zs.avail_out+<some constant>
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	357 * zs.avail_out is set nonzero by deflate in previous compress()
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	358 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	359 //tmpbuf = new void[zs.avail_out];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	360 zs.next_out = tmpbuf.ptr;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	361 zs.avail_out = tmpbuf.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	362
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	363 while( (err = deflate(&zs, mode)) != Z_STREAM_END)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	364 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	365 if (err == Z_OK)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	366 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	367 if (zs.avail_out != 0 && mode != Z_FINISH)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	368 break;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	369 else if(zs.avail_out == 0)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	370 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	371 destbuf ~= tmpbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	372 zs.next_out = tmpbuf.ptr;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	373 zs.avail_out = tmpbuf.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	374 continue;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	375 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	376 err = Z_BUF_ERROR;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	377 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	378 delete destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	379 error(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	380 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	381 destbuf ~= tmpbuf[0 .. (tmpbuf.length - zs.avail_out)];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	382
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	383 if (mode == Z_FINISH)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	384 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	385 err = deflateEnd(&zs);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	386 inited = 0;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	387 if (err)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	388 error(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	389 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	390 return destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	391 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	392 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	393
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	394 /******
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	395 * Used when the data to be decompressed is not all in one buffer.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	396 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	397
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	398 class UnCompress
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	399 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	400 private:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	401 z_stream zs;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	402 int inited;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	403 int done;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	404 uint destbufsize;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	405
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	406 void error(int err)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	407 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	408 if (inited)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	409 { inflateEnd(&zs);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	410 inited = 0;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	411 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	412 throw new ZlibException(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	413 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	414
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	415 public:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	416
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	417 /**
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	418 * Construct. destbufsize is the same as for D.zlib.uncompress().
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	419 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	420 this(uint destbufsize)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	421 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	422 this.destbufsize = destbufsize;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	423 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	424
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	425 /** ditto */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	426 this()
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	427 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	428 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	429
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	430 ~this()
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	431 { int err;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	432
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	433 if (inited)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	434 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	435 inited = 0;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	436 err = inflateEnd(&zs);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	437 if (err)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	438 error(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	439 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	440 done = 1;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	441 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	442
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	443 /**
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	444 * Decompress the data in buf and return the decompressed data.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	445 * The buffers returned from successive calls to this should be concatenated
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	446 * together.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	447 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	448 void[] uncompress(void[] buf)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	449 in
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	450 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	451 assert(!done);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	452 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	453 body
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	454 { int err;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	455 ubyte[] destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	456
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	457 if (buf.length == 0)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	458 return null;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	459
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	460 if (!inited)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	461 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	462 err = inflateInit(&zs);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	463 if (err)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	464 error(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	465 inited = 1;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	466 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	467
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	468 if (!destbufsize)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	469 destbufsize = buf.length * 2;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	470 destbuf = new ubyte[zs.avail_in * 2 + destbufsize];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	471 zs.next_out = destbuf.ptr;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	472 zs.avail_out = destbuf.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	473
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	474 if (zs.avail_in)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	475 buf = cast(void[])zs.next_in[0 .. zs.avail_in] ~ buf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	476
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	477 zs.next_in = cast(ubyte*) buf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	478 zs.avail_in = buf.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	479
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	480 err = inflate(&zs, Z_NO_FLUSH);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	481 if (err != Z_STREAM_END && err != Z_OK)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	482 { delete destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	483 error(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	484 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	485 destbuf.length = destbuf.length - zs.avail_out;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	486 return destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	487 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	488
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	489 /**
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	490 * Decompress and return any remaining data.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	491 * The returned data should be appended to that returned by uncompress().
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	492 * The UnCompress object cannot be used further.
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	493 */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	494 void[] flush()
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	495 in
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	496 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	497 assert(!done);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	498 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	499 out
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	500 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	501 assert(done);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	502 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	503 body
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	504 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	505 ubyte[] extra;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	506 ubyte[] destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	507 int err;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	508
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	509 done = 1;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	510 if (!inited)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	511 return null;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	512
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	513 L1:
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	514 destbuf = new ubyte[zs.avail_in * 2 + 100];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	515 zs.next_out = destbuf.ptr;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	516 zs.avail_out = destbuf.length;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	517
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	518 err = etc.c.zlib.inflate(&zs, Z_NO_FLUSH);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	519 if (err == Z_OK && zs.avail_out == 0)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	520 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	521 extra ~= destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	522 goto L1;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	523 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	524 if (err != Z_STREAM_END)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	525 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	526 delete destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	527 if (err == Z_OK)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	528 err = Z_BUF_ERROR;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	529 error(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	530 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	531 destbuf = destbuf.ptr[0 .. zs.next_out - destbuf.ptr];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	532 err = etc.c.zlib.inflateEnd(&zs);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	533 inited = 0;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	534 if (err)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	535 error(err);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	536 if (extra.length)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	537 destbuf = extra ~ destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	538 return destbuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	539 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	540 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	541
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	542 /* ========================== unittest ========================= */
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	543
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	544 private import std.stdio;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	545 private import std.random;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	546
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	547 unittest // by Dave
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	548 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	549 debug(zlib) printf("std.zlib.unittest\n");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	550
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	551 bool CompressThenUncompress (ubyte[] src)
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	552 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	553 try {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	554 ubyte[] dst = cast(ubyte[])std.zlib.compress(cast(void[])src);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	555 double ratio = (dst.length / cast(double)src.length);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	556 debug(zlib) writef("src.length: ", src.length, ", dst: ", dst.length, ", Ratio = ", ratio);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	557 ubyte[] uncompressedBuf;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	558 uncompressedBuf = cast(ubyte[])std.zlib.uncompress(cast(void[])dst);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	559 assert(src.length == uncompressedBuf.length);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	560 assert(src == uncompressedBuf);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	561 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	562 catch {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	563 debug(zlib) writefln(" ... Exception thrown when src.length = ", src.length, ".");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	564 return false;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	565 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	566 return true;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	567 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	568
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	569
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	570 // smallish buffers
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	571 for(int idx = 0; idx < 25; idx++) {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	572 char[] buf = new char[rand() % 100];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	573
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	574 // Alternate between more & less compressible
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	575 foreach(inout char c; buf) c = ' ' + (rand() % (idx % 2 ? 91 : 2));
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	576
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	577 if(CompressThenUncompress(cast(ubyte[])buf)) {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	578 debug(zlib) printf("; Success.\n");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	579 } else {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	580 return;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	581 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	582 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	583
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	584 // larger buffers
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	585 for(int idx = 0; idx < 25; idx++) {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	586 char[] buf = new char[rand() % 1000/0000/];
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	587
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	588 // Alternate between more & less compressible
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	589 foreach(inout char c; buf) c = ' ' + (rand() % (idx % 2 ? 91 : 10));
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	590
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	591 if(CompressThenUncompress(cast(ubyte[])buf)) {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	592 debug(zlib) printf("; Success.\n");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	593 } else {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	594 return;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	595 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	596 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	597
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	598 debug(zlib) printf("PASSED std.zlib.unittest\n");
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	599 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	600
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	601
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	602 unittest // by Artem Rebrov
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	603 {
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	604 Compress cmp = new Compress;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	605 UnCompress decmp = new UnCompress;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	606
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	607 void[] input;
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	608 input = "tesatdffadf";
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	609
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	610 void[] buf = cmp.compress(input);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	611 buf ~= cmp.flush();
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	612 void[] output = decmp.uncompress(buf);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	613
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	614 //writefln("input = '%s'", cast(char[])input);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	615 //writefln("output = '%s'", cast(char[])output);
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	616 assert( output[] == input[] );
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	617 }
373489eeaf90 Applied downs' lphobos update Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: diff changeset	618

Mercurial > projects > ldc

annotate lphobos/std/zlib.d @ 650:aa6a0b7968f7