← Back to branch summary

~ubuntu-branches/ubuntu/precise/p7zip/precise-updates

« back to all changes in this revision

Viewing changes to CPP/7zip/Archive/7z/7zEncode.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mohammed Adnène Trojette
  • Date: 2009-02-14 20:12:27 UTC
  • mfrom: (1.1.11 upstream) (2.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090214201227-go63qxm9ozfdma60
Tags: 4.65~dfsg.1-1
* New upstream release.
* Remove wx2.8 Build-Depends added by mistakes (7zG is not yet
  intended to be built).
* Use dh_clean without -k.

Show diffs side-by-side

added added

removed removed

Lines of Context:
CPP/7zip/Archive/7z/7zEncode.cpp
164
164
  }
165
165
  for (i = 1; i < _bindInfo.OutStreams.Size(); i++)
166
166
  {
167
 
    CSequentialOutTempBufferImp *tempBufferSpec = 
 
167
    CSequentialOutTempBufferImp *tempBufferSpec =
168
168
        new CSequentialOutTempBufferImp;
169
169
    CMyComPtr<ISequentialOutStream> tempBuffer = tempBufferSpec;
170
170
    tempBufferSpec->Init(&inOutTempBuffers[i - 1]);
195
195
  // UInt64 outStreamStartPos;
196
196
  // RINOK(stream->Seek(0, STREAM_SEEK_CUR, &outStreamStartPos));
197
197
  
198
 
  CSequentialInStreamSizeCount2 *inStreamSizeCountSpec = 
 
198
  CSequentialInStreamSizeCount2 *inStreamSizeCountSpec =
199
199
      new CSequentialInStreamSizeCount2;
200
200
  CMyComPtr<ISequentialInStream> inStreamSizeCount = inStreamSizeCountSpec;
201
 
  CSequentialOutStreamSizeCount *outStreamSizeCountSpec = 
 
201
  CSequentialOutStreamSizeCount *outStreamSizeCountSpec =
202
202
      new CSequentialOutStreamSizeCount;
203
203
  CMyComPtr<ISequentialOutStream> outStreamSizeCount = outStreamSizeCountSpec;
204
204
 
233
233
      outStreamSpec->Init();
234
234
      writeCoderProperties->WriteCoderProperties(outStream);
235
235
      size_t size = outStreamSpec->GetSize();
236
 
      encodingInfo.Properties.SetCapacity(size);
237
 
      memmove(encodingInfo.Properties, outStreamSpec->GetBuffer(), size);
 
236
      encodingInfo.Props.SetCapacity(size);
 
237
      memmove(encodingInfo.Props, outStreamSpec->GetBuffer(), size);
238
238
    }
239
239
  }
240
240
 
275
275
      streamSize = inStreamSizeCountSpec->GetSize();
276
276
    else
277
277
      streamSize = _mixerCoderSpec->GetWriteProcessedSize(binder);
278
 
    folderItem.UnPackSizes.Add(streamSize);
 
278
    folderItem.UnpackSizes.Add(streamSize);
279
279
  }
280
280
  for (i = numMethods - 1; i >= 0; i--)
281
 
    folderItem.Coders[numMethods - 1 - i].Properties = _codersInfo[i].Properties;
 
281
    folderItem.Coders[numMethods - 1 - i].Props = _codersInfo[i].Props;
282
282
  return S_OK;
283
283
}
284
284