diff options
| -rw-r--r-- | include-gpl/dsp/dspengine.h | 2 | ||||
| -rw-r--r-- | include-gpl/dsp/movingaverage.h | 2 | ||||
| -rw-r--r-- | include-gpl/dsp/scopevis.h | 2 | ||||
| -rw-r--r-- | plugins/samplesource/rtlsdr/rtlsdrgui.cpp | 2 | ||||
| -rw-r--r-- | sdrbase/audio/audiooutput.cpp | 4 | ||||
| -rw-r--r-- | sdrbase/dsp/scopevis.cpp | 6 | ||||
| -rw-r--r-- | sdrbase/util/simpleserializer.cpp | 12 |
7 files changed, 15 insertions, 15 deletions
diff --git a/include-gpl/dsp/dspengine.h b/include-gpl/dsp/dspengine.h index 69d1958..28d2dae 100644 --- a/include-gpl/dsp/dspengine.h +++ b/include-gpl/dsp/dspengine.h @@ -86,7 +86,7 @@ private: AudioOutput m_audioOutput; - int m_sampleRate; + uint m_sampleRate; quint64 m_centerFrequency; bool m_dcOffsetCorrection; diff --git a/include-gpl/dsp/movingaverage.h b/include-gpl/dsp/movingaverage.h index c08058b..e608efb 100644 --- a/include-gpl/dsp/movingaverage.h +++ b/include-gpl/dsp/movingaverage.h @@ -47,7 +47,7 @@ public: protected: std::vector<Real> m_history; Real m_sum; - int m_ptr; + uint m_ptr; }; #endif // INCLUDE_MOVINGAVERAGE_H diff --git a/include-gpl/dsp/scopevis.h b/include-gpl/dsp/scopevis.h index 83e389f..4845a63 100644 --- a/include-gpl/dsp/scopevis.h +++ b/include-gpl/dsp/scopevis.h @@ -33,7 +33,7 @@ private: GLScope* m_glScope; std::vector<Complex> m_trace; - int m_fill; + uint m_fill; TriggerState m_triggerState; TriggerChannel m_triggerChannel; FixReal m_triggerLevelHigh; diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp index a3d825c..7f933cf 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp @@ -126,7 +126,7 @@ void RTLSDRGui::on_centerFrequency_changed(quint64 value) void RTLSDRGui::on_gain_valueChanged(int value) { - if(value > m_gains.size()) + if(value > (int)m_gains.size()) return; int gain = m_gains[value]; ui->gainText->setText(tr("%1.%2").arg(gain / 10).arg(abs(gain % 10))); diff --git a/sdrbase/audio/audiooutput.cpp b/sdrbase/audio/audiooutput.cpp index 2bd6b93..88ca634 100644 --- a/sdrbase/audio/audiooutput.cpp +++ b/sdrbase/audio/audiooutput.cpp @@ -115,7 +115,7 @@ qint64 AudioOutput::readData(char* data, qint64 maxLen) maxLen -= maxLen % 4; int framesPerBuffer = maxLen / 4; - if(m_mixBuffer.size() < framesPerBuffer * 2) { + if((int)m_mixBuffer.size() < framesPerBuffer * 2) { m_mixBuffer.resize(framesPerBuffer * 2); // allocate 2 qint32 per frame (stereo) if(m_mixBuffer.size() != framesPerBuffer * 2) return 0; @@ -128,7 +128,7 @@ qint64 AudioOutput::readData(char* data, qint64 maxLen) uint samples = (*it)->read((quint8*)data, framesPerBuffer, 0); const qint16* src = (const qint16*)data; std::vector<qint32>::iterator dst = m_mixBuffer.begin(); - for(int i = 0; i < samples; i++) { + for(uint i = 0; i < samples; i++) { *dst += *src; ++src; ++dst; diff --git a/sdrbase/dsp/scopevis.cpp b/sdrbase/dsp/scopevis.cpp index 7a94130..70adf8b 100644 --- a/sdrbase/dsp/scopevis.cpp +++ b/sdrbase/dsp/scopevis.cpp @@ -36,7 +36,7 @@ void ScopeVis::feed(SampleVector::const_iterator begin, SampleVector::const_iter } if(m_triggerState == Triggered) { int count = end - begin; - if(count > m_trace.size() - m_fill) + if(count > (int)(m_trace.size() - m_fill)) count = m_trace.size() - m_fill; std::vector<Complex>::iterator it = m_trace.begin() + m_fill; for(int i = 0; i < count; ++i) { @@ -71,7 +71,7 @@ void ScopeVis::feed(SampleVector::const_iterator begin, SampleVector::const_iter } if(m_triggerState == Triggered) { int count = end - begin; - if(count > m_trace.size() - m_fill) + if(count > (int)(m_trace.size() - m_fill)) count = m_trace.size() - m_fill; std::vector<Complex>::iterator it = m_trace.begin() + m_fill; for(int i = 0; i < count; ++i) { @@ -96,7 +96,7 @@ void ScopeVis::feed(SampleVector::const_iterator begin, SampleVector::const_iter } } else { int count = end - begin; - if(count > m_trace.size() - m_fill) + if(count > (int)(m_trace.size() - m_fill)) count = m_trace.size() - m_fill; std::vector<Complex>::iterator it = m_trace.begin() + m_fill; for(int i = 0; i < count; ++i) { diff --git a/sdrbase/util/simpleserializer.cpp b/sdrbase/util/simpleserializer.cpp index 4574108..4230aa7 100644 --- a/sdrbase/util/simpleserializer.cpp +++ b/sdrbase/util/simpleserializer.cpp @@ -299,7 +299,7 @@ SimpleDeserializer::SimpleDeserializer(const QByteArray& data) : readOfs = it->ofs; m_version = 0; - for(int i = 0; i < it->length; i++) + for(uint i = 0; i < it->length; i++) m_version = (m_version << 8) | readByte(&readOfs); return; @@ -321,7 +321,7 @@ bool SimpleDeserializer::readS32(quint32 id, qint32* result, qint32 def) const readOfs = it->ofs; tmp = 0; - for(int i = 0; i < it->length; i++) { + for(uint i = 0; i < it->length; i++) { quint8 byte = readByte(&readOfs); if((i == 0) && (byte & 0x80)) tmp = -1; @@ -349,7 +349,7 @@ bool SimpleDeserializer::readU32(quint32 id, quint32* result, quint32 def) const readOfs = it->ofs; tmp = 0; - for(int i = 0; i < it->length; i++) + for(uint i = 0; i < it->length; i++) tmp = (tmp << 8) | readByte(&readOfs); *result = tmp; return true; @@ -373,7 +373,7 @@ bool SimpleDeserializer::readS64(quint32 id, qint64* result, qint64 def) const readOfs = it->ofs; tmp = 0; - for(int i = 0; i < it->length; i++) { + for(uint i = 0; i < it->length; i++) { quint8 byte = readByte(&readOfs); if((i == 0) && (byte & 0x80)) tmp = -1; @@ -401,7 +401,7 @@ bool SimpleDeserializer::readU64(quint32 id, quint64* result, quint64 def) const readOfs = it->ofs; tmp = 0; - for(int i = 0; i < it->length; i++) + for(uint i = 0; i < it->length; i++) tmp = (tmp << 8) | readByte(&readOfs); *result = tmp; return true; @@ -654,7 +654,7 @@ bool SimpleDeserializer::parseAll() qDebug("=="); */ - while(readOfs < m_data.size()) { + while(readOfs < (uint)m_data.size()) { if(!readTag(&readOfs, m_data.size(), &type, &id, &length)) return false; |