From 4bc1059a502380a1441c4bf6ac1caf834bcd7faf Mon Sep 17 00:00:00 2001 From: Daniele Forsi Date: Wed, 26 Apr 2023 22:17:33 +0200 Subject: [PATCH 1/2] Fix check for inconsistent latitude Fixes an error found by cppcheck: plugins/channelrx/demodadsb/adsbdemodgui.cpp:2168:121: error: Invalid abs() argument nr 1. A non-boolean value is required. [invalidFunctionArgBool] || (positionValid && aircraft->m_positionValid && ((abs(latitude - aircraft->m_latitude > 2.0f)) || (abs(longitude - aircraft->m_longitude) > 2.0f))) ^ --- plugins/channelrx/demodadsb/adsbdemodgui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp index 4a75e0e78..ae65c0394 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp @@ -2165,7 +2165,7 @@ void ADSBDemodGUI::decodeCommB(const QByteArray data, const QDateTime dateTime, float longitude = longitudeFix * (360.0f / 1048576.0f); bool positionInconsistent = !aircraft->m_positionValid - || (positionValid && aircraft->m_positionValid && ((abs(latitude - aircraft->m_latitude > 2.0f)) || (abs(longitude - aircraft->m_longitude) > 2.0f))) + || (positionValid && aircraft->m_positionValid && ((abs(latitude - aircraft->m_latitude) > 2.0f) || (abs(longitude - aircraft->m_longitude) > 2.0f))) || (!positionValid && ((latitudeFix != 0) || (longitudeFix != 0))); int pressureAltFix = ((data[9] & 0x7f) << 8) | (data[10] & 0xff); From 9801538bdfa8eeb0fdb15cd3e290bd9ab5b02b24 Mon Sep 17 00:00:00 2001 From: Daniele Forsi Date: Wed, 26 Apr 2023 23:44:33 +0200 Subject: [PATCH 2/2] Fix typo that generated a compiler warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: warning: label ‘std’ defined but not used [-Wunused-label] --- plugins/channelrx/demodam/amdemodsink.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/channelrx/demodam/amdemodsink.cpp b/plugins/channelrx/demodam/amdemodsink.cpp index 66f195a5a..5a721a3c4 100644 --- a/plugins/channelrx/demodam/amdemodsink.cpp +++ b/plugins/channelrx/demodam/amdemodsink.cpp @@ -203,7 +203,7 @@ void AMDemodSink::processOneSample(Complex &ci) if (m_audioBufferFill >= m_audioBuffer.size()) { - std:;size_t res = m_audioFifo.write((const quint8*)&m_audioBuffer[0], std::min(m_audioBufferFill, m_audioBuffer.size())); + std::size_t res = m_audioFifo.write((const quint8*)&m_audioBuffer[0], std::min(m_audioBufferFill, m_audioBuffer.size())); if (res != m_audioBufferFill) {