From 2c9260d075371f084718808ad977f31eaef65a77 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Fri, 7 May 2021 22:06:51 +0100 Subject: [PATCH] Fix gcc warnings --- plugins/channelrx/demodais/aisdemodsink.cpp | 2 -- sdrbase/dsp/gaussian.h | 2 +- sdrbase/util/ais.cpp | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/channelrx/demodais/aisdemodsink.cpp b/plugins/channelrx/demodais/aisdemodsink.cpp index 7aa129511..bf6f75ee3 100644 --- a/plugins/channelrx/demodais/aisdemodsink.cpp +++ b/plugins/channelrx/demodais/aisdemodsink.cpp @@ -144,8 +144,6 @@ void AISDemodSink::processOneSample(Complex &ci) bool scopeCRCInvalid = false; Real dcOffset = 0.0f; bool thresholdMet = false; - Real peakFreq = 0.0f; - Real freqOffset = 0.0f; if (m_rxBufCnt >= m_rxBufLength) { Real trainingSum = 0.0f; diff --git a/sdrbase/dsp/gaussian.h b/sdrbase/dsp/gaussian.h index 1240a18e2..6765fdd08 100644 --- a/sdrbase/dsp/gaussian.h +++ b/sdrbase/dsp/gaussian.h @@ -115,7 +115,7 @@ public: private: std::vector m_taps; std::vector m_samples; - int m_ptr; + unsigned int m_ptr; }; #endif // INCLUDE_GAUSSIAN_H diff --git a/sdrbase/util/ais.cpp b/sdrbase/util/ais.cpp index 52ca7d0b7..12920509a 100644 --- a/sdrbase/util/ais.cpp +++ b/sdrbase/util/ais.cpp @@ -118,7 +118,7 @@ QString AISMessage::typeToString(quint8 type) return "N/A"; } else if ((type >= 100) && (type < 199)) { return "Preserved for regional use"; - } else if ((type >= 200) && (type <= 255)) { + } else if (type >= 200) { return "Preserved for future use"; } else if ((type >= 50) && (type <= 59)) { const QStringList specialCrafts = { @@ -267,7 +267,7 @@ QString AISMessage::getString(const QByteArray ba, int byteIdx, int bitsLeft, in AISPositionReport::AISPositionReport(QByteArray ba) : AISMessage(ba) { - m_status = ((ba[4] & 0x3) << 2) | (ba[5] >> 6) & 0x3; + m_status = ((ba[4] & 0x3) << 2) | ((ba[5] >> 6) & 0x3); int rateOfTurn = ((ba[5] << 2) & 0xfc) | ((ba[6] >> 6) & 0x3); if (rateOfTurn == 127) {