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 81a9f0c7f1c428f94f0b10dca2995aa7a6244c64..19543aa2408e4708972b71557b02827adba89cac 100644 (file)
--- a/src/KaxBlock.cpp
+++ b/src/KaxBlock.cpp
@@ -242,7 +242,7 @@ LacingType KaxInternalBlock::GetBestLacingType() const {
 uint64 KaxInternalBlock::UpdateSize(bool bSaveDefault, bool bForceRender)\r
 {\r
        LacingType LacingHere;\r
-       assert(GetData() == NULL); // Data is not used for KaxInternalBlock\r
+    assert(EbmlBinary::GetBuffer() == NULL); // Data is not used for KaxInternalBlock\r
        assert(TrackNumber < 0x4000); // no more allowed for the moment\r
        unsigned int i;\r
 \r
@@ -306,7 +306,7 @@ KaxBlockVirtual::KaxBlockVirtual(const KaxBlockVirtual & ElementToClone)
 uint64 KaxBlockVirtual::UpdateSize(bool bSaveDefault, bool bForceRender)\r
 {\r
        assert(TrackNumber < 0x4000);\r
-       binary *cursor = GetData();\r
+       binary *cursor = EbmlBinary::GetBuffer();\r
        // fill data\r
        if (TrackNumber < 0x80) {\r
                *cursor++ = TrackNumber | 0x80; // set the first bit to 1 \r
@@ -519,7 +519,7 @@ uint64 KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)
        if (ReadFully == SCOPE_ALL_DATA)\r
        {\r
                Result = EbmlBinary::ReadData(input, ReadFully);\r
-               binary *cursor = GetData();\r
+        binary *cursor = EbmlBinary::GetBuffer();\r
                uint8 BlockHeadSize = 4;\r
 \r
                // update internal values\r
@@ -552,7 +552,7 @@ uint64 KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)
 \r
                // put all Frames in the list\r
                if (mLacing == LACING_NONE) {\r
-                       FirstFrameLocation += cursor - GetData();\r
+                       FirstFrameLocation += cursor - EbmlBinary::GetBuffer();\r
                        DataBuffer * soloFrame = new DataBuffer(cursor, GetSize() - BlockHeadSize);\r
                        myBuffers.push_back(soloFrame);\r
                        SizeList.resize(1);\r
@@ -611,7 +611,7 @@ uint64 KaxInternalBlock::ReadData(IOCallback & input, ScopeMode ReadFully)
                                assert(0);\r
                        }\r
 \r
-                       FirstFrameLocation += cursor - GetData();\r
+                       FirstFrameLocation += cursor - EbmlBinary::GetBuffer();\r
 \r
                        for (Index=0; Index<=FrameNum; Index++) {\r
                                DataBuffer * lacedFrame = new DataBuffer(cursor, SizeList[Index]);\r