diff options
| author | Yann Collet <Cyan4973@users.noreply.github.com> | 2020-07-14 01:09:02 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 01:09:02 (GMT) |
| commit | 8ef649f3a8f9d2cd8223c2cf8478206e303d0a3a (patch) | |
| tree | bd46e978884e81e291895c0634554060394d26a5 /lib | |
| parent | 3d5311edc6f62d5988fccda65cd17a7433d9590f (diff) | |
| parent | 2a7203c05d58e3094df7c173226f5127e15970ad (diff) | |
| download | lz4-8ef649f3a8f9d2cd8223c2cf8478206e303d0a3a.zip lz4-8ef649f3a8f9d2cd8223c2cf8478206e303d0a3a.tar.gz lz4-8ef649f3a8f9d2cd8223c2cf8478206e303d0a3a.tar.bz2 | |
Merge pull request #866 from sandyharvie/dev
Fix issue #865
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/lz4frame.c | 3 | ||||
| -rw-r--r-- | lib/lz4frame.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/lz4frame.c b/lib/lz4frame.c index c9f630d..5d716ea 100644 --- a/lib/lz4frame.c +++ b/lib/lz4frame.c @@ -725,6 +725,9 @@ size_t LZ4F_compressBegin(LZ4F_cctx* cctxPtr, */ size_t LZ4F_compressBound(size_t srcSize, const LZ4F_preferences_t* preferencesPtr) { + if (preferencesPtr && preferencesPtr->autoFlush) { + return LZ4F_compressBound_internal(srcSize, preferencesPtr, 0); + } return LZ4F_compressBound_internal(srcSize, preferencesPtr, (size_t)-1); } diff --git a/lib/lz4frame.h b/lib/lz4frame.h index 391e484..87b0b2a 100644 --- a/lib/lz4frame.h +++ b/lib/lz4frame.h @@ -284,7 +284,7 @@ LZ4FLIB_API size_t LZ4F_compressBegin(LZ4F_cctx* cctx, * @return is always the same for a srcSize and prefsPtr. * prefsPtr is optional : when NULL is provided, preferences will be set to cover worst case scenario. * tech details : - * @return includes the possibility that internal buffer might already be filled by up to (blockSize-1) bytes. + * @return if automatic flushing is not enabled, includes the possibility that internal buffer might already be filled by up to (blockSize-1) bytes. * It also includes frame footer (ending + checksum), since it might be generated by LZ4F_compressEnd(). * @return doesn't include frame header, as it was already generated by LZ4F_compressBegin(). */ |