diff options
| author | John Hurst <jhurst@cinecert.com> | 2021-05-11 14:14:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-11 14:14:01 -0700 |
| commit | b71135239b4710bcdccd88adde161acf954706cb (patch) | |
| tree | 4cfa2c5123fac71f75178247c80911856e3087be /src/AS_DCP_internal.h | |
| parent | 8c51d30f81cc4a123ec75be93e67cedb48982e40 (diff) | |
| parent | 794d14855362ca5e3d5a99ed9bf86bd506a172c1 (diff) | |
Merge pull request #32 from cth103/warning-fixes
Warning fixes
Diffstat (limited to 'src/AS_DCP_internal.h')
| -rwxr-xr-x | src/AS_DCP_internal.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h index 7162368..a08d56a 100755 --- a/src/AS_DCP_internal.h +++ b/src/AS_DCP_internal.h @@ -196,8 +196,8 @@ namespace ASDCP ~KLReader() {} inline const byte_t* Key() { return m_KeyBuf; } - inline const ui64_t Length() { return m_ValueLength; } - inline const ui64_t KLLength() { return m_KLLength; } + inline ui64_t Length() { return m_ValueLength; } + inline ui64_t KLLength() { return m_KLLength; } Result_t ReadKLFromFile(Kumu::FileReader& Reader); }; @@ -226,7 +226,7 @@ namespace ASDCP Kumu::fpos_t m_LastPosition; TrackFileReader(const Dictionary& d) : - m_HeaderPart(m_Dict), m_IndexAccess(m_Dict), m_RIP(m_Dict), m_Dict(&d) + m_Dict(&d), m_HeaderPart(m_Dict), m_IndexAccess(m_Dict), m_RIP(m_Dict) { default_md_object_init(); } @@ -249,7 +249,6 @@ namespace ASDCP if ( ASDCP_SUCCESS(result) ) { result = m_RIP.InitFromFile(m_File); - ui32_t test_s = (ui32_t)m_RIP.PairArray.size(); if ( ASDCP_FAILURE(result) ) { @@ -358,7 +357,7 @@ namespace ASDCP // get absolute frame position and go read the frame's key and length Result_t result = RESULT_OK; - if ( TmpEntry.StreamOffset != m_LastPosition ) + if ( static_cast<Kumu::fpos_t>(TmpEntry.StreamOffset) != m_LastPosition ) { m_LastPosition = TmpEntry.StreamOffset; result = m_File.Seek(TmpEntry.StreamOffset); |