diff options
author | David Walter Seikel | 2013-01-13 18:54:10 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-01-13 18:54:10 +1000 |
commit | 959831f4ef5a3e797f576c3de08cd65032c997ad (patch) | |
tree | e7351908be5995f0b325b2ebeaa02d5a34b82583 /libraries/irrlicht-1.8/source/Irrlicht/zlib/uncompr.c | |
parent | Add info about changes to Irrlicht. (diff) | |
download | SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.zip SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.gz SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.bz2 SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.xz |
Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard.
Diffstat (limited to '')
-rw-r--r-- | libraries/irrlicht-1.8/source/Irrlicht/zlib/uncompr.c | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/zlib/uncompr.c b/libraries/irrlicht-1.8/source/Irrlicht/zlib/uncompr.c index f07773c..ad98be3 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/zlib/uncompr.c +++ b/libraries/irrlicht-1.8/source/Irrlicht/zlib/uncompr.c | |||
@@ -1,59 +1,59 @@ | |||
1 | /* uncompr.c -- decompress a memory buffer | 1 | /* uncompr.c -- decompress a memory buffer |
2 | * Copyright (C) 1995-2003, 2010 Jean-loup Gailly. | 2 | * Copyright (C) 1995-2003, 2010 Jean-loup Gailly. |
3 | * For conditions of distribution and use, see copyright notice in zlib.h | 3 | * For conditions of distribution and use, see copyright notice in zlib.h |
4 | */ | 4 | */ |
5 | 5 | ||
6 | /* @(#) $Id$ */ | 6 | /* @(#) $Id$ */ |
7 | 7 | ||
8 | #define ZLIB_INTERNAL | 8 | #define ZLIB_INTERNAL |
9 | #include "zlib.h" | 9 | #include "zlib.h" |
10 | 10 | ||
11 | /* =========================================================================== | 11 | /* =========================================================================== |
12 | Decompresses the source buffer into the destination buffer. sourceLen is | 12 | Decompresses the source buffer into the destination buffer. sourceLen is |
13 | the byte length of the source buffer. Upon entry, destLen is the total | 13 | the byte length of the source buffer. Upon entry, destLen is the total |
14 | size of the destination buffer, which must be large enough to hold the | 14 | size of the destination buffer, which must be large enough to hold the |
15 | entire uncompressed data. (The size of the uncompressed data must have | 15 | entire uncompressed data. (The size of the uncompressed data must have |
16 | been saved previously by the compressor and transmitted to the decompressor | 16 | been saved previously by the compressor and transmitted to the decompressor |
17 | by some mechanism outside the scope of this compression library.) | 17 | by some mechanism outside the scope of this compression library.) |
18 | Upon exit, destLen is the actual size of the compressed buffer. | 18 | Upon exit, destLen is the actual size of the compressed buffer. |
19 | 19 | ||
20 | uncompress returns Z_OK if success, Z_MEM_ERROR if there was not | 20 | uncompress returns Z_OK if success, Z_MEM_ERROR if there was not |
21 | enough memory, Z_BUF_ERROR if there was not enough room in the output | 21 | enough memory, Z_BUF_ERROR if there was not enough room in the output |
22 | buffer, or Z_DATA_ERROR if the input data was corrupted. | 22 | buffer, or Z_DATA_ERROR if the input data was corrupted. |
23 | */ | 23 | */ |
24 | int ZEXPORT uncompress (dest, destLen, source, sourceLen) | 24 | int ZEXPORT uncompress (dest, destLen, source, sourceLen) |
25 | Bytef *dest; | 25 | Bytef *dest; |
26 | uLongf *destLen; | 26 | uLongf *destLen; |
27 | const Bytef *source; | 27 | const Bytef *source; |
28 | uLong sourceLen; | 28 | uLong sourceLen; |
29 | { | 29 | { |
30 | z_stream stream; | 30 | z_stream stream; |
31 | int err; | 31 | int err; |
32 | 32 | ||
33 | stream.next_in = (Bytef*)source; | 33 | stream.next_in = (Bytef*)source; |
34 | stream.avail_in = (uInt)sourceLen; | 34 | stream.avail_in = (uInt)sourceLen; |
35 | /* Check for source > 64K on 16-bit machine: */ | 35 | /* Check for source > 64K on 16-bit machine: */ |
36 | if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; | 36 | if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; |
37 | 37 | ||
38 | stream.next_out = dest; | 38 | stream.next_out = dest; |
39 | stream.avail_out = (uInt)*destLen; | 39 | stream.avail_out = (uInt)*destLen; |
40 | if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; | 40 | if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; |
41 | 41 | ||
42 | stream.zalloc = (alloc_func)0; | 42 | stream.zalloc = (alloc_func)0; |
43 | stream.zfree = (free_func)0; | 43 | stream.zfree = (free_func)0; |
44 | 44 | ||
45 | err = inflateInit(&stream); | 45 | err = inflateInit(&stream); |
46 | if (err != Z_OK) return err; | 46 | if (err != Z_OK) return err; |
47 | 47 | ||
48 | err = inflate(&stream, Z_FINISH); | 48 | err = inflate(&stream, Z_FINISH); |
49 | if (err != Z_STREAM_END) { | 49 | if (err != Z_STREAM_END) { |
50 | inflateEnd(&stream); | 50 | inflateEnd(&stream); |
51 | if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) | 51 | if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) |
52 | return Z_DATA_ERROR; | 52 | return Z_DATA_ERROR; |
53 | return err; | 53 | return err; |
54 | } | 54 | } |
55 | *destLen = stream.total_out; | 55 | *destLen = stream.total_out; |
56 | 56 | ||
57 | err = inflateEnd(&stream); | 57 | err = inflateEnd(&stream); |
58 | return err; | 58 | return err; |
59 | } | 59 | } |