From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 26 Sep 2022 21:51:59 +0000 (-0700)
Subject: clang-tidy: avoid some implicit conversions
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22a31711d3a5805ed3e7097dc52726443ac5cb00;p=libmatroska

clang-tidy: avoid some implicit conversions

Found by adding explicit for various operators

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/src/KaxBlockData.cpp b/src/KaxBlockData.cpp
index bc4072f..e03a218 100644
--- a/src/KaxBlockData.cpp
+++ b/src/KaxBlockData.cpp
@@ -77,8 +77,8 @@ filepos_t KaxReferenceBlock::UpdateSize(bool bSaveDefault, bool bForceRender)
     assert(RefdBlock != nullptr);
     assert(ParentBlock != nullptr);
 
-    const KaxInternalBlock &block = *RefdBlock;
-    *static_cast<EbmlSInteger*>(this) = (static_cast<int64>(block.GlobalTimecode()) - static_cast<int64>(ParentBlock->GlobalTimecode())) / static_cast<int64>(ParentBlock->GlobalTimecodeScale());
+    const auto &block = static_cast<const KaxInternalBlock&>(*RefdBlock);
+    SetValue(static_cast<int64>(block.GlobalTimecode()) - static_cast<int64>(ParentBlock->GlobalTimecode()) / static_cast<int64>(ParentBlock->GlobalTimecodeScale()));
   }
   return EbmlSInteger::UpdateSize(bSaveDefault, bForceRender);
 }
diff --git a/src/KaxCues.cpp b/src/KaxCues.cpp
index bdaf359..7c3ce2c 100644
--- a/src/KaxCues.cpp
+++ b/src/KaxCues.cpp
@@ -96,7 +96,7 @@ void KaxCues::PositionSet(const KaxBlockGroup & BlockRef)
   // look for the element in the temporary references
   auto it = std::find_if(myTempReferences.begin(), myTempReferences.end(),
     [&](const KaxBlockBlob *myTempReference)
-      { const KaxInternalBlock &refTmp = *myTempReference;
+      { const auto &refTmp = static_cast<const KaxInternalBlock &>(*myTempReference);
         return refTmp.GlobalTimecode() == BlockRef.GlobalTimecode()
             && refTmp.TrackNum() == BlockRef.TrackNumber(); });
 
diff --git a/src/KaxCuesData.cpp b/src/KaxCuesData.cpp
index e95c180..ef36620 100644
--- a/src/KaxCuesData.cpp
+++ b/src/KaxCuesData.cpp
@@ -80,12 +80,12 @@ void KaxCuePoint::PositionSet(const KaxBlockGroup & BlockReference, uint64 Globa
 
 void KaxCuePoint::PositionSet(const KaxBlockBlob & BlobReference, uint64 GlobalTimecodeScale)
 {
-  const KaxInternalBlock &BlockReference = BlobReference;
+  const auto &BlockReference = static_cast<const KaxInternalBlock&>(BlobReference);
   const KaxBlockGroup *BlockGroupPointer = nullptr;
 
   if (!BlobReference.IsSimpleBlock()) {
-    const KaxBlockGroup &BlockGroup = BlobReference;
-    BlockGroupPointer = & BlockGroup;
+    const auto &BlockGroup = static_cast<const KaxBlockGroup&>(BlobReference);
+    BlockGroupPointer = &BlockGroup;
   }
   PositionSet(BlockReference, BlockGroupPointer, GlobalTimecodeScale);
 }
@@ -135,7 +135,7 @@ void KaxCuePoint::PositionSet(const KaxInternalBlock & BlockReference, const Kax
 */
 void KaxCueReference::AddReference(const KaxBlockBlob & BlockReference, uint64 GlobalTimecodeScale)
 {
-  const KaxInternalBlock & theBlock = BlockReference;
+  const auto& theBlock = static_cast<const KaxInternalBlock&>(BlockReference);
   auto & NewTime = GetChild<KaxCueRefTime>(*this);
   *static_cast<EbmlUInteger*>(&NewTime) = theBlock.GlobalTimecode() / GlobalTimecodeScale;