github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: ZCompress / ZDecompress now have 'hdr' parameter

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7260 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-04-15 18:14:10 +00:00
parent b3ebf652ab
commit 9e7db5acd5
3 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
uppsrc/Core/src.tpp/Zlib$en-us.tpp
View file

@ -128,10 +128,11 @@ in single zlib call.&]
[s0; &]
[ {{10000@(113.42.0) [s0;%% [*@7;4 Compression / decompression functions]]}}&]
[s3; &]
[s5;:ZCompress`(Stream`&`,Stream`&`,int64`,Gate2`<int64`,int64`>`): [_^int64^ int64]_[* Z
Compress]([_^Stream^ Stream][@(0.0.255) `&]_[*@3 out], [_^Stream^ Stream][@(0.0.255) `&]_[*@3 i
n], [_^int64^ int64]_[*@3 size], [_^Gate2^ Gate2]<[_^int64^ int64], [_^int64^ int64]>_[*@3 pr
ogress]_`=_[@(0.0.255) false])&]
[s5;:ZCompress`(Stream`&`,Stream`&`,int64`,Gate2`<int64`,int64`>`,bool`): [_^int64^ int
64]_[* ZCompress]([_^Stream^ Stream][@(0.0.255) `&]_[*@3 out], [_^Stream^ Stream][@(0.0.255) `&
]_[*@3 in], [_^int64^ int64]_[*@3 size], [_^Gate2^ Gate2]<[_^int64^ int64],
[_^int64^ int64]>_[*@3 progress]_`=_[@(0.0.255) false], [@(0.0.255) bool]_[*@3 hdr]_`=_[@(0.0.255) t
rue])&]
[s5;:ZCompress`(Stream`&`,Stream`&`,Gate2`<int64`,int64`>`): [_^int64^ int64]_[* ZCompres
s]([_^Stream^ Stream][@(0.0.255) `&]_[*@3 out], [_^Stream^ Stream][@(0.0.255) `&]_[*@3 in],
[_^Gate2^ Gate2]<[_^int64^ int64], [_^int64^ int64]>_[*@3 progress]_`=_[@(0.0.255) false])&]
@ -146,9 +147,16 @@ memory [%-*@3 data][%- , ][%-*@3 len] or input string [%-*@3 s] to output
stream [%-*@3 out] (in this case returns a number of bytes written
or negative integer to signal error) or into String return value
(returns IsVoid String on error). [%-*@3 progress] can be used
to track progress of operation, returning true cancels operation.&]
to track progress of operation, returning true cancels operation.
Parameter [%-*@3 hdr] can be used to switch`-off zlib header (see
zlib documentation for details).&]
[s3;%% &]
[s4;%% &]
[s4; &]
[s5;:ZDecompress`(Stream`&`,Stream`&`,int64`,Gate2`<int64`,int64`>`,bool`): [_^int64^ i
nt64]_[* ZDecompress]([_^Stream^ Stream][@(0.0.255) `&]_[*@3 out], [_^Stream^ Stream][@(0.0.255) `&
]_[*@3 in], [_^int64^ int64]_[*@3 size], [_^Gate2^ Gate2]<[_^int64^ int64],
[_^int64^ int64]>_[*@3 progress]_`=_[@(0.0.255) false], [@(0.0.255) bool]_[*@3 hdr]_`=_[@(0.0.255) t
rue])&]
[s5;:ZDecompress`(Stream`&`,Stream`&`,int64`,Gate2`<int64`,int64`>`): [_^int64^ int64]_
[* ZDecompress]([_^Stream^ Stream][@(0.0.255) `&]_[*@3 out], [_^Stream^ Stream][@(0.0.255) `&
]_[*@3 in], [_^int64^ int64]_[*@3 size], [_^Gate2^ Gate2]<[_^int64^ int64],
@ -168,7 +176,9 @@ memory [%-*@3 data][%- , ][%-*@3 len] or input string [%-*@3 s] to output
stream [%-*@3 out] (in this case returns a number of bytes written
or negative integer to signal error) or into String return value
(returns IsVoid String on error). [%-*@3 progress] can be used
to track progress of operation, returning true cancels operation.&]
to track progress of operation, returning true cancels operation.
Parameter [%-*@3 hdr] can be used to switch`-off zlib header (see
zlib documentation for details).&]
[s3;%% &]
[s4;%% &]
[s5;:GZCompress`(Stream`&`,Stream`&`,int64`,Gate2`<int64`,int64`>`): [_^int64^ int64]_[* G

8
uppsrc/Core/z.cpp
View file

@ -346,14 +346,14 @@ int64 zPress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress,
return r;
}
int64 ZCompress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress)
int64 ZCompress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress, bool hdr)
{
return zPress(out, in, size, progress, false, true);
return zPress(out, in, size, progress, false, true, NULL, hdr);
}
int64 ZDecompress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress)
int64 ZDecompress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress, bool hdr)
{
return zPress(out, in, size, progress, false, false);
return zPress(out, in, size, progress, false, false, NULL, hdr);
}
int64 ZCompress(Stream& out, Stream& in, Gate2<int64, int64> progress)

4
uppsrc/Core/z.h
View file

@ -73,12 +73,12 @@ public:
~Zlib();
};
int64 ZCompress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress = false);
int64 ZCompress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress = false, bool hdr = true);
int64 ZCompress(Stream& out, Stream& in, Gate2<int64, int64> progress = false);
String ZCompress(const void *data, int64 len, Gate2<int64, int64> progress = false);
String ZCompress(const String& s, Gate2<int64, int64> progress = false);
int64 ZDecompress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress = false);
int64 ZDecompress(Stream& out, Stream& in, int64 size, Gate2<int64, int64> progress = false, bool hdr = true);
int64 ZDecompress(Stream& out, Stream& in, Gate2<int64, int64> progress = false);
String ZDecompress(const void *data, int64 len, Gate2<int64, int64> progress = false);
String ZDecompress(const String& s, Gate2<int64, int64> progress = false);