is a command-line file archiver with a high compression ratio (a port of the Windows program 7za.exe).
| 7zEncode.cpp (p7zip_15.14.1_src_all) | : | 7zEncode.cpp (p7zip_16.02_src_all) |
|---|
| | |
| skipping to change at line 145 | | skipping to change at line 145 |
|---|
| { | | { |
| #ifdef USE_MIXER_ST | | #ifdef USE_MIXER_ST |
| _mixerST = new NCoderMixer2::CMixerST(true); | | _mixerST = new NCoderMixer2::CMixerST(true); |
| _mixerRef = _mixerST; | | _mixerRef = _mixerST; |
| _mixer = _mixerST; | | _mixer = _mixerST; |
| #endif | | #endif |
| } | | } |
| | |
| RINOK(_mixer->SetBindInfo(_bindInfo)); | | RINOK(_mixer->SetBindInfo(_bindInfo)); |
| | |
|
| FOR_VECTOR (i, _options.Methods) | | FOR_VECTOR (m, _options.Methods) |
| { | | { |
|
| const CMethodFull &methodFull = _options.Methods[i]; | | const CMethodFull &methodFull = _options.Methods[m]; |
| | |
| CCreatedCoder cod; | | CCreatedCoder cod; |
| | |
| RINOK(CreateCoder( | | RINOK(CreateCoder( |
| EXTERNAL_CODECS_LOC_VARS | | EXTERNAL_CODECS_LOC_VARS |
| methodFull.Id, true, cod)); | | methodFull.Id, true, cod)); |
| | |
| if (cod.NumStreams != methodFull.NumStreams) | | if (cod.NumStreams != methodFull.NumStreams) |
| return E_FAIL; | | return E_FAIL; |
| if (!cod.Coder && !cod.Coder2) | | if (!cod.Coder && !cod.Coder2) |
| | |
| skipping to change at line 400 | | skipping to change at line 400 |
|---|
| { | | { |
| mtProgressSpec = new CMtEncMultiProgress; | | mtProgressSpec = new CMtEncMultiProgress; |
| mtProgress = mtProgressSpec; | | mtProgress = mtProgressSpec; |
| mtProgressSpec->Init(compressProgress); | | mtProgressSpec->Init(compressProgress); |
| | |
| mtOutStreamNotifySpec = new CSequentialOutMtNotify; | | mtOutStreamNotifySpec = new CSequentialOutMtNotify; |
| mtOutStreamNotify = mtOutStreamNotifySpec; | | mtOutStreamNotify = mtOutStreamNotifySpec; |
| mtOutStreamNotifySpec->_stream = outStream; | | mtOutStreamNotifySpec->_stream = outStream; |
| mtOutStreamNotifySpec->_mtProgresSpec = mtProgressSpec; | | mtOutStreamNotifySpec->_mtProgresSpec = mtProgressSpec; |
| | |
|
| FOR_VECTOR(i, tempBufferSpecs) | | FOR_VECTOR(t, tempBufferSpecs) |
| { | | { |
|
| tempBufferSpecs[i]->_mtProgresSpec = mtProgressSpec; | | tempBufferSpecs[t]->_mtProgresSpec = mtProgressSpec; |
| } | | } |
| } | | } |
| | |
| if (_bindInfo.PackStreams.Size() != 0) | | if (_bindInfo.PackStreams.Size() != 0) |
| { | | { |
| outStreamSizeCountSpec = new CSequentialOutStreamSizeCount; | | outStreamSizeCountSpec = new CSequentialOutStreamSizeCount; |
| outStreamSizeCount = outStreamSizeCountSpec; | | outStreamSizeCount = outStreamSizeCountSpec; |
| outStreamSizeCountSpec->SetStream(mtOutStreamNotify ? (ISequentialOutStream
*)mtOutStreamNotify : outStream); | | outStreamSizeCountSpec->SetStream(mtOutStreamNotify ? (ISequentialOutStream
*)mtOutStreamNotify : outStream); |
| outStreamSizeCountSpec->Init(); | | outStreamSizeCountSpec->Init(); |
| outStreamPointers.Add(outStreamSizeCount); | | outStreamPointers.Add(outStreamSizeCount); |
| | |
| skipping to change at line 578 | | skipping to change at line 578 |
|---|
| break; | | break; |
| | |
| UInt32 outIndex = _bindInfo.Coder_to_Stream[ci]; | | UInt32 outIndex = _bindInfo.Coder_to_Stream[ci]; |
| int bond = _bindInfo.FindBond_for_PackStream(outIndex); | | int bond = _bindInfo.FindBond_for_PackStream(outIndex); |
| if (bond >= 0) | | if (bond >= 0) |
| { | | { |
| ci = _bindInfo.Bonds[bond].UnpackIndex; | | ci = _bindInfo.Bonds[bond].UnpackIndex; |
| continue; | | continue; |
| } | | } |
| | |
|
| int i = _bindInfo.FindStream_in_PackStreams(outIndex); | | int si = _bindInfo.FindStream_in_PackStreams(outIndex); |
| if (i >= 0) | | if (si >= 0) |
| _bindInfo.PackStreams.MoveToFront(i); | | _bindInfo.PackStreams.MoveToFront(si); |
| break; | | break; |
| } | | } |
| } | | } |
| | |
| if (_options.PasswordIsDefined) | | if (_options.PasswordIsDefined) |
| { | | { |
| unsigned numCryptoStreams = _bindInfo.PackStreams.Size(); | | unsigned numCryptoStreams = _bindInfo.PackStreams.Size(); |
| | |
| unsigned numInStreams = _bindInfo.Coders.Size(); | | unsigned numInStreams = _bindInfo.Coders.Size(); |
| | |
| | | |
| End of changes. 5 change blocks. |
|---|
| 7 lines changed or deleted | | 7 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 