diff options
author | Przemyslaw Skibinski <inikep@gmail.com> | 2017-02-10 13:54:21 (GMT) |
---|---|---|
committer | Przemyslaw Skibinski <inikep@gmail.com> | 2017-02-10 13:54:21 (GMT) |
commit | 272699a4e91cbdda8dac8f22f8f9d11bfea09ab5 (patch) | |
tree | b1cf7bc95d7c8036f80014a45e95ffb54f0bb162 | |
parent | c7b14967ab5c677086aa1427af4c000fa341343c (diff) | |
parent | 04e5eaf9bc21a1fb5ed8bfcd03ad127bdf5ff4ca (diff) | |
download | lz4-272699a4e91cbdda8dac8f22f8f9d11bfea09ab5.zip lz4-272699a4e91cbdda8dac8f22f8f9d11bfea09ab5.tar.gz lz4-272699a4e91cbdda8dac8f22f8f9d11bfea09ab5.tar.bz2 |
Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | contrib/cmake_unofficial/CMakeLists.txt | 2 | ||||
-rw-r--r-- | lib/lz4frame.h | 10 |
3 files changed, 11 insertions, 3 deletions
@@ -89,7 +89,7 @@ clean: #------------------------------------------------------------------------ #make install is validated only for Linux, OSX, kFreeBSD, Hurd and #FreeBSD targets -ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD)) +ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD DragonFly)) HOST_OS = POSIX install: diff --git a/contrib/cmake_unofficial/CMakeLists.txt b/contrib/cmake_unofficial/CMakeLists.txt index 9a0983d..e59a756 100644 --- a/contrib/cmake_unofficial/CMakeLists.txt +++ b/contrib/cmake_unofficial/CMakeLists.txt @@ -215,4 +215,6 @@ else() set(INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}") endif() +# for liblz4.pc substitution +set(VERSION ${LZ4_VERSION_STRING}) configure_file(${LZ4_LIB_SOURCE_DIR}/liblz4.pc.in liblz4.pc @ONLY) diff --git a/lib/lz4frame.h b/lib/lz4frame.h index 82fbeab..9d9fe89 100644 --- a/lib/lz4frame.h +++ b/lib/lz4frame.h @@ -91,8 +91,8 @@ LZ4FLIB_API const char* LZ4F_getErrorName(LZ4F_errorCode_t code); /**< return /*-************************************ -* Frame compression types -**************************************/ + * Frame compression types + **************************************/ /* #define LZ4F_DISABLE_OBSOLETE_ENUMS */ /* uncomment to disable obsolete enums */ #ifndef LZ4F_DISABLE_OBSOLETE_ENUMS # define LZ4F_OBSOLETE_ENUM(x) , LZ4F_DEPRECATE(x) = LZ4F_##x @@ -100,6 +100,9 @@ LZ4FLIB_API const char* LZ4F_getErrorName(LZ4F_errorCode_t code); /**< return # define LZ4F_OBSOLETE_ENUM(x) #endif +/* The larger the block size, the (slightly) better the compression ratio, + * though there are diminishing returns. + * Larger blocks also increase memory usage on both compression and decompression sides. */ typedef enum { LZ4F_default=0, LZ4F_max64KB=4, @@ -112,6 +115,9 @@ typedef enum { LZ4F_OBSOLETE_ENUM(max4MB) } LZ4F_blockSizeID_t; +/* Linked blocks sharply reduce inefficiencies when using small blocks, + * they compress better. + * However, some LZ4 decoders are only compatible with independent blocks */ typedef enum { LZ4F_blockLinked=0, LZ4F_blockIndependent |