From: Steve Lhomme Date: Wed, 17 Mar 2010 18:34:22 +0000 (+0000) Subject: the internal GetData() is the same as GetBuffer() X-Git-Tag: release-0.9.0~45 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9d3a11f77431e6d6ffe8f40713ae4cb00a6b06e9;p=libmatroska the internal GetData() is the same as GetBuffer() git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libmatroska@31 a6f86f6d-0131-4f8e-9e7b-e335508773d5 --- diff --git a/src/KaxBlock.cpp b/src/KaxBlock.cpp index 81a9f0c..19543aa 100644 --- a/src/KaxBlock.cpp +++ b/src/KaxBlock.cpp @@ -242,7 +242,7 @@ LacingType KaxInternalBlock::GetBestLacingType() const { uint64 KaxInternalBlock::UpdateSize(bool bSaveDefault, bool bForceRender) { LacingType LacingHere; - assert(GetData() == NULL); // Data is not used for KaxInternalBlock + assert(EbmlBinary::GetBuffer() == NULL); // Data is not used for KaxInternalBlock assert(TrackNumber < 0x4000); // no more allowed for the moment unsigned int i; @@ -306,7 +306,7 @@ KaxBlockVirtual::KaxBlockVirtual(const KaxBlockVirtual & ElementToClone) uint64 KaxBlockVirtual::UpdateSize(bool bSaveDefault, bool bForceRender) { assert(TrackNumber < 0x4000); - binary *cursor = GetData(); + binary *cursor = EbmlBinary::GetBuffer(); // fill data if (TrackNumber < 0x80) { *cursor++ = TrackNumber | 0x80; // set the first bit to 1 @@ -519,7 +519,7 @@ uint64 KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully) if (ReadFully == SCOPE_ALL_DATA) { Result = EbmlBinary::ReadData(input, ReadFully); - binary *cursor = GetData(); + binary *cursor = EbmlBinary::GetBuffer(); uint8 BlockHeadSize = 4; // update internal values @@ -552,7 +552,7 @@ uint64 KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully) // put all Frames in the list if (mLacing == LACING_NONE) { - FirstFrameLocation += cursor - GetData(); + FirstFrameLocation += cursor - EbmlBinary::GetBuffer(); DataBuffer * soloFrame = new DataBuffer(cursor, GetSize() - BlockHeadSize); myBuffers.push_back(soloFrame); SizeList.resize(1); @@ -611,7 +611,7 @@ uint64 KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully) assert(0); } - FirstFrameLocation += cursor - GetData(); + FirstFrameLocation += cursor - EbmlBinary::GetBuffer(); for (Index=0; Index<=FrameNum; Index++) { DataBuffer * lacedFrame = new DataBuffer(cursor, SizeList[Index]);