From a849c01cbfcdeacb41197da8b7944607c67e5ff0 Mon Sep 17 00:00:00 2001
From: Oksana Shadura <oksana.shadura@cern.ch>
Date: Mon, 20 Aug 2018 14:37:15 +0200
Subject: [PATCH] Revert "Changing default from ZLIB to LZ4 in case of illegal
algorithm usage in ROOT"
This reverts commit 8ac9554e05c146a4f8aefcb8024ef2781f764fb2.
---
core/zip/src/RZip.cxx | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/core/zip/src/RZip.cxx b/core/zip/src/RZip.cxx
index 0601af6fef9..d66d1723ab5 100644
--- a/core/zip/src/RZip.cxx
+++ b/core/zip/src/RZip.cxx
@@ -100,14 +100,11 @@ void R__zipMultipleAlgorithm(int cxlevel, int *srcsize, char *src, int *tgtsize,
} else if (compressionAlgorithm == ROOT::ECompressionAlgorithm::kOldCompressionAlgo || compressionAlgorithm == ROOT::ECompressionAlgorithm::kUseGlobalCompressionSetting) {
R__zipOld(cxlevel, srcsize, src, tgtsize, tgt, irep);
return;
- } else if (compressionAlgorithm == ROOT::ECompressionAlgorithm::kZLIB) {
- R__zipZLIB(cxlevel, srcsize, src, tgtsize, tgt, irep);
- return;
} else {
- // 4 is for LZ4 (which is the default), LZ4 is also used for any illegal
+ // 1 is for ZLIB (which is the default), ZLIB is also used for any illegal
// algorithm setting. This was a poor historic choice, as poor code may result in
// a surprising change in algorithm in a future version of ROOT.
- R__zipLZ4(cxlevel, srcsize, src, tgtsize, tgt, irep);
+ R__zipZLIB(cxlevel, srcsize, src, tgtsize, tgt, irep);
return;
}
}
--
GitLab