From 8b3a282e00d907320123e450ac6faee29cfe0e4d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Apr 2020 20:06:14 +0200 Subject: Remove some unused variables. --- src/AS_DCP_internal.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/AS_DCP_internal.h') diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h index 7162368..7c1e74d 100755 --- a/src/AS_DCP_internal.h +++ b/src/AS_DCP_internal.h @@ -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) ) { -- cgit v1.2.3 From 31ace7591005675b514cc534762f91e576c69424 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Apr 2020 20:06:56 +0200 Subject: Remove const from return types in cases where it doesn't have any meaning. --- src/AS_DCP_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/AS_DCP_internal.h') diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h index 7c1e74d..045e78f 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); }; -- cgit v1.2.3 From 502ee050855da2af9e73c6be8aa2f6f2d73c52f9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Apr 2020 20:24:24 +0200 Subject: Fix initialisation order of constructors. --- src/AS_02_PHDR.cpp | 2 +- src/AS_DCP_internal.h | 2 +- src/KM_util.cpp | 2 +- src/MXF.cpp | 6 +++--- src/h__02_Reader.cpp | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/AS_DCP_internal.h') diff --git a/src/AS_02_PHDR.cpp b/src/AS_02_PHDR.cpp index 471d226..6876e5b 100644 --- a/src/AS_02_PHDR.cpp +++ b/src/AS_02_PHDR.cpp @@ -355,7 +355,7 @@ public: byte_t m_EssenceUL[SMPTE_UL_LENGTH]; byte_t m_MetadataUL[SMPTE_UL_LENGTH]; - h__Writer(const Dictionary& d) : h__AS02WriterFrame(d), m_EssenceSubDescriptor(0), m_MetadataTrackSubDescriptor(0) { + h__Writer(const Dictionary& d) : h__AS02WriterFrame(d), m_MetadataTrackSubDescriptor(0), m_EssenceSubDescriptor(0) { memset(m_EssenceUL, 0, SMPTE_UL_LENGTH); memset(m_MetadataUL, 0, SMPTE_UL_LENGTH); } diff --git a/src/AS_DCP_internal.h b/src/AS_DCP_internal.h index 045e78f..ad21170 100755 --- a/src/AS_DCP_internal.h +++ b/src/AS_DCP_internal.h @@ -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(); } diff --git a/src/KM_util.cpp b/src/KM_util.cpp index d263d6e..da8d732 100755 --- a/src/KM_util.cpp +++ b/src/KM_util.cpp @@ -129,7 +129,7 @@ Kumu::Result_t::Get(unsigned int i) } // -Kumu::Result_t::Result_t(int v, const std::string& s, const std::string& l) : value(v), symbol(s), label(l) +Kumu::Result_t::Result_t(int v, const std::string& s, const std::string& l) : value(v), label(l), symbol(s) { assert(!l.empty()); assert(!s.empty()); diff --git a/src/MXF.cpp b/src/MXF.cpp index 5cab95e..1bf16ed 100755 --- a/src/MXF.cpp +++ b/src/MXF.cpp @@ -1026,8 +1026,8 @@ ASDCP::MXF::OP1aHeader::Dump(FILE* stream) // ASDCP::MXF::OPAtomIndexFooter::OPAtomIndexFooter(const Dictionary*& d) : - Partition(d), m_Dict(d), - m_CurrentSegment(0), m_BytesPerEditUnit(0), m_BodySID(0), + Partition(d), m_CurrentSegment(0), m_BytesPerEditUnit(0), + m_BodySID(0), m_Dict(d), m_ECOffset(0), m_Lookup(0) { BodySID = 0; @@ -1769,7 +1769,7 @@ ASDCP::MXF::decode_mca_string(const std::string& s, const mca_label_map_t& label } // -ASDCP::MXF::ASDCP_MCAConfigParser::ASDCP_MCAConfigParser(const Dictionary*& d) : m_Dict(d), m_ChannelCount(0) +ASDCP::MXF::ASDCP_MCAConfigParser::ASDCP_MCAConfigParser(const Dictionary*& d) : m_ChannelCount(0), m_Dict(d) { typedef mca_label_map_t::value_type pair; m_LabelMap.insert(pair("L", label_traits("Left" , true, m_Dict->ul(MDD_DCAudioChannel_L)))); diff --git a/src/h__02_Reader.cpp b/src/h__02_Reader.cpp index b3c092b..e807387 100644 --- a/src/h__02_Reader.cpp +++ b/src/h__02_Reader.cpp @@ -64,8 +64,8 @@ AS_02::default_md_object_init() AS_02::MXF::AS02IndexReader::AS02IndexReader(const ASDCP::Dictionary*& d) : - m_Duration(0), m_BytesPerEditUnit(0), - ASDCP::MXF::Partition(d), m_Dict(d) {} + ASDCP::MXF::Partition(d), + m_Duration(0), m_BytesPerEditUnit(0), m_Dict(d) {} AS_02::MXF::AS02IndexReader::~AS02IndexReader() {} -- cgit v1.2.3 From 151c66ce6e04a361ba5bc34776cf6f5146fc53b5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 6 Apr 2020 20:34:06 +0200 Subject: Fix comparisons between signed and unsigned values. --- src/AS_02_PCM.cpp | 2 +- src/AS_DCP_internal.h | 2 +- src/JP2K_Sequence_Parser.cpp | 2 +- src/KM_log.cpp | 2 +- src/MXFTypes.cpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/AS_DCP_internal.h') 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(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(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(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); } -- cgit v1.2.3