Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/kornelski/7z.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '7zip/Archive/BZip2/BZip2Update.cpp')
-rwxr-xr-x7zip/Archive/BZip2/BZip2Update.cpp26
1 files changed, 16 insertions, 10 deletions
diff --git a/7zip/Archive/BZip2/BZip2Update.cpp b/7zip/Archive/BZip2/BZip2Update.cpp
index 114c79d1..d9bdf963 100755
--- a/7zip/Archive/BZip2/BZip2Update.cpp
+++ b/7zip/Archive/BZip2/BZip2Update.cpp
@@ -23,7 +23,11 @@ namespace NBZip2 {
HRESULT UpdateArchive(UInt64 unpackSize,
ISequentialOutStream *outStream,
int indexInClient,
+ UInt32 dictionary,
UInt32 numPasses,
+ #ifdef COMPRESS_MT
+ UInt32 numThreads,
+ #endif
IArchiveUpdateCallback *updateCallback)
{
RINOK(updateCallback->SetTotal(unpackSize));
@@ -53,21 +57,23 @@ HRESULT UpdateArchive(UInt64 unpackSize,
encoder.QueryInterface(IID_ICompressSetCoderProperties, &setCoderProperties);
if (setCoderProperties)
{
- /*
- NWindows::NCOM::CPropVariant properties[2] =
+ NWindows::NCOM::CPropVariant properties[] =
{
- dictionary, numPasses
+ dictionary,
+ numPasses
+ #ifdef COMPRESS_MT
+ , numThreads
+ #endif
};
- PROPID propIDs[2] =
+ PROPID propIDs[] =
{
NCoderPropID::kDictionarySize,
- NCoderPropID::kNumPasses,
+ NCoderPropID::kNumPasses
+ #ifdef COMPRESS_MT
+ , NCoderPropID::kNumThreads
+ #endif
};
- RINOK(setCoderProperties->SetCoderProperties(propIDs, properties, 2));
- */
- NWindows::NCOM::CPropVariant property = numPasses;
- PROPID propID = NCoderPropID::kNumPasses;
- RINOK(setCoderProperties->SetCoderProperties(&propID, &property, 1));
+ RINOK(setCoderProperties->SetCoderProperties(propIDs, properties, sizeof(propIDs) / sizeof(propIDs[0])));
}
RINOK(encoder->Code(fileInStream, outStream, NULL, NULL, localProgress));