← Back to branch summary

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

« back to all changes in this revision

Viewing changes to CPP/7zip/Archive/Common/CoderMixer2ST.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/Common/CoderMixer2ST.cpp
11
11
CCoderMixer2ST::~CCoderMixer2ST(){ }
12
12
 
13
13
HRESULT CCoderMixer2ST::SetBindInfo(const CBindInfo &bindInfo)
14
 
{  
15
 
  _bindInfo = bindInfo; 
16
 
  return S_OK; 
 
14
{
 
15
  _bindInfo = bindInfo;
 
16
  return S_OK;
17
17
}
18
18
 
19
19
void CCoderMixer2ST::AddCoderCommon(bool isMain)
37
37
void CCoderMixer2ST::ReInit() { }
38
38
 
39
39
HRESULT CCoderMixer2ST::GetInStream(
40
 
    ISequentialInStream **inStreams, const UInt64 **inSizes, 
 
40
    ISequentialInStream **inStreams, const UInt64 **inSizes,
41
41
    UInt32 streamIndex, ISequentialInStream **inStreamRes)
42
42
{
43
43
  CMyComPtr<ISequentialInStream> seqInStream;
54
54
    return E_INVALIDARG;
55
55
 
56
56
  UInt32 coderIndex, coderStreamIndex;
57
 
  _bindInfo.FindOutStream(_bindInfo.BindPairs[binderIndex].OutIndex, 
 
57
  _bindInfo.FindOutStream(_bindInfo.BindPairs[binderIndex].OutIndex,
58
58
      coderIndex, coderStreamIndex);
59
59
 
60
60
  CCoderInfo &coder = _coders[coderIndex];
86
86
}
87
87
 
88
88
HRESULT CCoderMixer2ST::GetOutStream(
89
 
    ISequentialOutStream **outStreams, const UInt64 **outSizes, 
 
89
    ISequentialOutStream **outStreams, const UInt64 **outSizes,
90
90
    UInt32 streamIndex, ISequentialOutStream **outStreamRes)
91
91
{
92
92
  CMyComPtr<ISequentialOutStream> seqOutStream;
103
103
    return E_INVALIDARG;
104
104
 
105
105
  UInt32 coderIndex, coderStreamIndex;
106
 
  _bindInfo.FindInStream(_bindInfo.BindPairs[binderIndex].InIndex, 
 
106
  _bindInfo.FindInStream(_bindInfo.BindPairs[binderIndex].InIndex,
107
107
      coderIndex, coderStreamIndex);
108
108
 
109
109
  CCoderInfo &coder = _coders[coderIndex];
136
136
    
137
137
 
138
138
STDMETHODIMP CCoderMixer2ST::Code(ISequentialInStream **inStreams,
139
 
      const UInt64 **inSizes, 
 
139
      const UInt64 **inSizes,
140
140
      UInt32 numInStreams,
141
 
      ISequentialOutStream **outStreams, 
 
141
      ISequentialOutStream **outStreams,
142
142
      const UInt64 **outSizes,
143
143
      UInt32 numOutStreams,
144
144
      ICompressProgressInfo *progress)
148
148
    return E_INVALIDARG;
149
149
 
150
150
  // Find main coder
151
 
  int _mainCoderIndex = -1; // FIXME - hide _mainCoderIndex
 
151
  int _mainCoderIndex = -1;
152
152
  int i;
153
153
  for (i = 0; i < _coders.Size(); i++)
154
154
    if (_coders[i].IsMain)
216
216
  else
217
217
  {
218
218
    RINOK(mainCoder.Coder2->Code(
219
 
        &seqInStreamsSpec.Front(), 
 
219
        &seqInStreamsSpec.Front(),
220
220
        &mainCoder.InSizePointers.Front(), mainCoder.NumInStreams,
221
 
        &seqOutStreamsSpec.Front(), 
 
221
        &seqOutStreamsSpec.Front(),
222
222
        &mainCoder.OutSizePointers.Front(), mainCoder.NumOutStreams,
223
223
        progress));
224
224
  }
236
236
}
237
237
*/
238
238
 
239
 
}  
 
239
}