diff options
| author | Zandra Hird <[email protected]> | 2015-03-17 09:07:34 +0100 |
|---|---|---|
| committer | Zandra Hird <[email protected]> | 2015-03-17 09:08:06 +0100 |
| commit | 29a1d1169f84c591c5d39175a1ad683449f0f727 (patch) | |
| tree | 6e665aab9825e83634868248f71e0cef1335f67c /erts | |
| parent | da0cfbabbae668bcacbf3e5fff1ebdc173e6f1e1 (diff) | |
| parent | 7d82a632f4837764ac79dfb4986d102060bd3080 (diff) | |
| download | otp-29a1d1169f84c591c5d39175a1ad683449f0f727.tar.gz otp-29a1d1169f84c591c5d39175a1ad683449f0f727.tar.bz2 otp-29a1d1169f84c591c5d39175a1ad683449f0f727.zip | |
Merge branch 'essen/zlib-windowbits'
* essen/zlib-windowbits:
Update zlib:zwindowbits/0 type to accept 8 and -8
OTP-12564
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/zlib.xml | 6 | ||||
| -rw-r--r-- | erts/preloaded/src/zlib.erl | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/erts/doc/src/zlib.xml b/erts/doc/src/zlib.xml index 673b743e2e..1f10ddef6d 100644 --- a/erts/doc/src/zlib.xml +++ b/erts/doc/src/zlib.xml @@ -99,7 +99,7 @@ list_to_binary([Compressed|Last])</pre> <datatype> <name name="zwindowbits"/> <desc> - <p>Normally in the range <c>-15..-9 | 9..15</c>.</p> + <p>Normally in the range <c>-15..-8 | 8..15</c>.</p> </desc> </datatype> </datatypes> @@ -149,7 +149,7 @@ list_to_binary([Compressed|Last])</pre> currently the only supported method is <c>deflated</c>.</p> <p>The <c><anno>WindowBits</anno></c> parameter is the base two logarithm of the window size (the size of the history buffer). It - should be in the range 9 through 15. Larger values + should be in the range 8 through 15. Larger values of this parameter result in better compression at the expense of memory usage. The default value is 15 if <c>deflateInit/2</c>. A negative <c><anno>WindowBits</anno></c> @@ -288,7 +288,7 @@ list_to_binary([B1,B2])</pre> <p>Initialize decompression session on zlib stream.</p> <p>The <c><anno>WindowBits</anno></c> parameter is the base two logarithm of the maximum window size (the size of the history buffer). - It should be in the range 9 through 15. + It should be in the range 8 through 15. The default value is 15 if <c>inflateInit/1</c> is used. If a compressed stream with a larger window size is given as input, inflate() will throw the <c>data_error</c> diff --git a/erts/preloaded/src/zlib.erl b/erts/preloaded/src/zlib.erl index 5ebc67dcaa..61dc642536 100644 --- a/erts/preloaded/src/zlib.erl +++ b/erts/preloaded/src/zlib.erl @@ -126,7 +126,7 @@ -type zlevel() :: 'none' | 'default' | 'best_compression' | 'best_speed' | 0..9. -type zmethod() :: 'deflated'. --type zwindowbits() :: -15..-9 | 9..47. +-type zwindowbits() :: -15..-8 | 8..47. -type zmemlevel() :: 1..9. -type zstrategy() :: 'default' | 'filtered' | 'huffman_only' | 'rle'. @@ -531,8 +531,8 @@ arg_method(_) -> erlang:error(badarg). -spec arg_bitsz(zwindowbits()) -> zwindowbits(). arg_bitsz(Bits) when is_integer(Bits) andalso - ((8 < Bits andalso Bits < 48) orelse - (-15 =< Bits andalso Bits < -8)) -> + ((8 =< Bits andalso Bits < 48) orelse + (-15 =< Bits andalso Bits =< -8)) -> Bits; arg_bitsz(_) -> erlang:error(badarg). |