Sergio
/
sdrangelove
forked from sdr/sdrangelove
1
0
Fork 0
Code Pull Requests Actions Packages Projects Releases Activity

fix signedness

This commit is contained in:
Hoernchen 2013-08-07 18:23:53 +02:00
parent f2c767d9f0
commit 37e6f6ff29
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include-gpl/dsp/dspengine.h
View File

@ -86,7 +86,7 @@ private:
AudioOutput m_audioOutput;
int m_sampleRate;
uint m_sampleRate;
quint64 m_centerFrequency;
bool m_dcOffsetCorrection;

2
include-gpl/dsp/movingaverage.h
View File

@ -47,7 +47,7 @@ public:
protected:
std::vector<Real> m_history;
Real m_sum;
int m_ptr;
uint m_ptr;
};
#endif // INCLUDE_MOVINGAVERAGE_H

2
include-gpl/dsp/scopevis.h
View File

@ -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;

2
plugins/samplesource/rtlsdr/rtlsdrgui.cpp
View File

@ -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)));

4
sdrbase/audio/audiooutput.cpp
View File

@ -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;

6
sdrbase/dsp/scopevis.cpp
View File

@ -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) {

12
sdrbase/util/simpleserializer.cpp
View File

@ -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;