diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2017-04-30 03:00:00 +0300 |
|---|---|---|
| committer | Kornel <kornel@geekhood.net> | 2017-05-05 20:56:20 +0300 |
| commit | 2efa10565ac395d2ce9a679ead46e70fb2f963eb (patch) | |
| tree | 84c8df4deb69ec44ea15af9378f24347db55c357 /CPP/7zip/Archive/7z/7zEncode.cpp | |
| parent | 603abd5528c97346e9448c0ff47949f818fe558c (diff) | |
17.0017.00
Diffstat (limited to 'CPP/7zip/Archive/7z/7zEncode.cpp')
| -rw-r--r-- | CPP/7zip/Archive/7z/7zEncode.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CPP/7zip/Archive/7z/7zEncode.cpp b/CPP/7zip/Archive/7z/7zEncode.cpp index 97e9ad7a..b206faa5 100644 --- a/CPP/7zip/Archive/7z/7zEncode.cpp +++ b/CPP/7zip/Archive/7z/7zEncode.cpp @@ -333,7 +333,7 @@ HRESULT CEncoder::Encode( } for (i = 0; i < numMethods; i++) - _mixer->SetCoderInfo(i, NULL, NULL); + _mixer->SetCoderInfo(i, NULL, NULL, false); /* inStreamSize can be used by BCJ2 to set optimal range of conversion. @@ -429,10 +429,12 @@ HRESULT CEncoder::Encode( for (i = 1; i < _bindInfo.PackStreams.Size(); i++) outStreamPointers.Add(tempBuffers[i - 1]); + bool dataAfterEnd_Error; + RINOK(_mixer->Code( &inStreamPointer, &outStreamPointers.Front(), - mtProgress ? (ICompressProgressInfo *)mtProgress : compressProgress)); + mtProgress ? (ICompressProgressInfo *)mtProgress : compressProgress, dataAfterEnd_Error)); if (_bindInfo.PackStreams.Size() != 0) packSizes.Add(outStreamSizeCountSpec->GetSize()); |