diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-04-06 20:34:06 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-07-11 01:28:41 +0200 |
| commit | 151c66ce6e04a361ba5bc34776cf6f5146fc53b5 (patch) | |
| tree | 4c58212435d919a3f6e62974a559bfd2edf7385f /src | |
| parent | 502ee050855da2af9e73c6be8aa2f6f2d73c52f9 (diff) | |
Fix comparisons between signed and unsigned values.
Diffstat (limited to 'src')
| -rw-r--r-- | src/AS_02_PCM.cpp | 2 | ||||
| -rwxr-xr-x | src/AS_DCP_internal.h | 2 | ||||
| -rwxr-xr-x | src/JP2K_Sequence_Parser.cpp | 2 | ||||
| -rwxr-xr-x | src/KM_log.cpp | 2 | ||||
| -rwxr-xr-x | src/MXFTypes.cpp | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/AS_02_PCM.cpp b/src/AS_02_PCM.cpp index 1d7ab5e..1d090e6 100644 --- a/src/AS_02_PCM.cpp +++ b/src/AS_02_PCM.cpp @@ -168,7 +168,7 @@ AS_02::PCM::MXFReader::h__Reader::ReadFrame(ui32_t FrameNum, ASDCP::PCM::FrameBu ui64_t position = m_ClipEssenceBegin + offset; Result_t result = RESULT_OK; - if ( m_File.Tell() != position ) + if ( m_File.Tell() != static_cast<Kumu::fpos_t>(position) ) { result = m_File.Seek(position); } diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h index ad21170..a08d56a 100755 --- a/src/AS_DCP_internal.h +++ b/src/AS_DCP_internal.h @@ -357,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); diff --git a/src/JP2K_Sequence_Parser.cpp b/src/JP2K_Sequence_Parser.cpp index c561033..a8de925 100755 --- a/src/JP2K_Sequence_Parser.cpp +++ b/src/JP2K_Sequence_Parser.cpp @@ -259,7 +259,7 @@ operator==(const ASDCP::JP2K::ExtendedCapabilities_t& lhs, const ASDCP::JP2K::Ex if (lhs.Pcap != rhs.Pcap) return false; - for (ui32_t i = 0; i < lhs.N; i++) + for (i32_t i = 0; i < lhs.N; i++) { if (lhs.Ccap[i] != rhs.Ccap[i]) return false; diff --git a/src/KM_log.cpp b/src/KM_log.cpp index d820dba..1a9354a 100755 --- a/src/KM_log.cpp +++ b/src/KM_log.cpp @@ -152,7 +152,7 @@ Kumu::StreamLogSink::WriteEntry(const LogEntry& Entry) { Entry.CreateStringWithOptions(buf, m_options); ssize_t n = write(m_fd, buf.c_str(), buf.size()); - assert(n==buf.size()); + assert(n==static_cast<ssize_t>(buf.size())); } } diff --git a/src/MXFTypes.cpp b/src/MXFTypes.cpp index 72338bb..77030e9 100755 --- a/src/MXFTypes.cpp +++ b/src/MXFTypes.cpp @@ -715,7 +715,7 @@ ASDCP::MXF::RGBALayout::EncodeString(char* buf, ui32_t buf_len) const std::string tmp_str; char tmp_buf[64]; - for ( int i = 0; i < RGBAValueLength && m_value[i] != 0; i += 2 ) + for ( size_t i = 0; i < RGBAValueLength && m_value[i] != 0; i += 2 ) { snprintf(tmp_buf, 64, "%c(%d)", get_char_for_code(m_value[i]), m_value[i+1]); @@ -815,7 +815,7 @@ ASDCP::MXF::J2KExtendedCapabilitiesType::EncodeString(char* str_buf, ui32_t buf_ if ( Pcap != 0 && buf_len > str_len ) { - for ( int i = 0; i < Ccap.size(); ++i ) + for ( size_t i = 0; i < Ccap.size(); ++i ) { snprintf(str_buf+(i*3), 4, "%02hx.", Ccap[i].value); } |
