[matroska] r1225 - trunk/libmatroska/src

Author: robux4
Date: 2005-10-14 00:35:17 +0400 (Fri, 14 Oct 2005)
New Revision: 1225

Modified:
   trunk/libmatroska/src/KaxBlock.cpp
   trunk/libmatroska/src/KaxBlockData.cpp
Log:
libmatroska: KaxBlockBlob now works in NO SimpleBlock mode too
that means writing or KaxSimpleBlock is now fully functional

Modified: trunk/libmatroska/src/KaxBlock.cpp
===================================================================
--- trunk/libmatroska/src/KaxBlock.cpp	2005-10-13 19:33:23 UTC (rev 1224)
+++ trunk/libmatroska/src/KaxBlock.cpp	2005-10-13 20:35:17 UTC (rev 1225)
@@ -1036,8 +1036,9 @@
 		} else {
 			Block.group = new KaxBlockGroup();
 		}
+	}
+	if (ParentCluster != NULL)
 		Block.group->SetParent(*ParentCluster);
-	}
 
 	bUseSimpleBlock = false;
 	return true;

Modified: trunk/libmatroska/src/KaxBlockData.cpp
===================================================================
--- trunk/libmatroska/src/KaxBlockData.cpp	2005-10-13 19:33:23 UTC (rev 1224)
+++ trunk/libmatroska/src/KaxBlockData.cpp	2005-10-13 20:35:17 UTC (rev 1225)
@@ -113,7 +113,8 @@
 		assert(RefdBlock != NULL);
 		assert(ParentBlock != NULL);
 
-		Value = (int64(((KaxInternalBlock*)RefdBlock)->GlobalTimecode()) - int64(ParentBlock->GlobalTimecode())) / int64(ParentBlock->GlobalTimecodeScale());
+		const KaxInternalBlock &block = *RefdBlock;
+		Value = (int64(block.GlobalTimecode()) - int64(ParentBlock->GlobalTimecode())) / int64(ParentBlock->GlobalTimecodeScale());
 	}
 	return EbmlSInteger::UpdateSize(bSaveDefault, bForceRender);
 }