From 686954ea845a7b05a8bdb8d2ed9a002a88e698e6 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Wed, 13 Sep 2017 09:43:00 -0400 Subject: Bug 1398021 - Update lz4 to version 1.8.0. r=froydnj, a=RyanVM --HG-- extra : source : 9a4077eda5d80e2f7c7fe271035bee2e2d034cec extra : histedit_source : 64eb1f6e9b2b08981644d7edccd22997d6463b4b%2C5619daf512a89b3a6bf84eca781190b56e8dea31 --- mfbt/Compression.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'mfbt/Compression.cpp') diff --git a/mfbt/Compression.cpp b/mfbt/Compression.cpp index c114c6c0f..6be8020a9 100644 --- a/mfbt/Compression.cpp +++ b/mfbt/Compression.cpp @@ -16,8 +16,12 @@ using namespace mozilla::Compression; namespace { +extern "C" { + #include "lz4.c" +} + }/* anonymous namespace */ /* Our wrappers */ @@ -27,7 +31,8 @@ LZ4::compress(const char* aSource, size_t aInputSize, char* aDest) { CheckedInt inputSizeChecked = aInputSize; MOZ_ASSERT(inputSizeChecked.isValid()); - return LZ4_compress(aSource, aDest, inputSizeChecked.value()); + return LZ4_compress_default(aSource, aDest, inputSizeChecked.value(), + LZ4_compressBound(inputSizeChecked.value())); } size_t @@ -38,8 +43,8 @@ LZ4::compressLimitedOutput(const char* aSource, size_t aInputSize, char* aDest, MOZ_ASSERT(inputSizeChecked.isValid()); CheckedInt maxOutputSizeChecked = aMaxOutputSize; MOZ_ASSERT(maxOutputSizeChecked.isValid()); - return LZ4_compress_limitedOutput(aSource, aDest, inputSizeChecked.value(), - maxOutputSizeChecked.value()); + return LZ4_compress_default(aSource, aDest, inputSizeChecked.value(), + maxOutputSizeChecked.value()); } bool -- cgit v1.2.3