cast to EbmlId instead of accessing Generic() GlobalId directly

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/libebml@8 a6f86f6d-0131-4f8e-9e7b-e335508773d5
This commit is contained in:
Steve Lhomme
2010-03-15 15:57:04 +00:00
parent 56aecb45f7
commit 02bd471dcf

View File

@@ -327,7 +327,7 @@ EbmlElement *EbmlMaster::FindNextElt(const EbmlElement & PastElt, bool bCreateIf
} }
while (Index < ElementList.size()) { while (Index < ElementList.size()) {
if (PastElt.Generic().GlobalId == ElementList[Index]->Generic().GlobalId) if ((EbmlId)PastElt == (EbmlId)(*ElementList[Index]))
break; break;
Index++; Index++;
} }
@@ -364,7 +364,7 @@ EbmlElement *EbmlMaster::FindNextElt(const EbmlElement & PastElt) const
} }
while (Index < ElementList.size()) { while (Index < ElementList.size()) {
if (PastElt.Generic().GlobalId == ElementList[Index]->Generic().GlobalId) if ((EbmlId)PastElt == (EbmlId)(*ElementList[Index]))
return ElementList[Index]; return ElementList[Index];
Index++; Index++;
} }
@@ -456,7 +456,7 @@ void EbmlMaster::Read(EbmlStream & inDataStream, const EbmlSemanticContext & sCo
} }
processCrc: processCrc:
for (Index=0; Index<ElementList.size(); Index++) { for (Index=0; Index<ElementList.size(); Index++) {
if (ElementList[Index]->Generic().GlobalId == EbmlCrc32::ClassInfos.GlobalId) { if ((EbmlId)(*ElementList[Index]) == EbmlCrc32::ClassInfos.GlobalId) {
bChecksumUsed = true; bChecksumUsed = true;
// remove the element // remove the element
Checksum = *(static_cast<EbmlCrc32*>(ElementList[Index])); Checksum = *(static_cast<EbmlCrc32*>(ElementList[Index]));