comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-02 14:04:47 -04:00
Code Issues Projects Releases Wiki Activity

Fix signed/unsigned variables

Browse Source
This commit is contained in:
Stanisław Pitucha
2016-01-29 07:49:31 +11:00
parent a364ffec6e
commit 035353123d
19 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/panel/WaterfallPanel.cpp
+5 -5
View File
@@ -7,7 +7,7 @@ WaterfallPanel::WaterfallPanel() : GLPanel(), fft_size(0), waterfall_lines(0), w
}
}
void WaterfallPanel::setup(int fft_size_in, int num_waterfall_lines_in) {
void WaterfallPanel::setup(unsigned int fft_size_in, int num_waterfall_lines_in) {
waterfall_lines = num_waterfall_lines_in;
fft_size = fft_size_in;
lines_buffered.store(0);
@@ -34,9 +34,9 @@ void WaterfallPanel::refreshTheme() {
}
void WaterfallPanel::setPoints(std::vector<float> &points) {
int halfPts = points.size()/2;
size_t halfPts = points.size()/2;
if (halfPts == fft_size) {
for (int i = 0; i < fft_size; i++) {
for (unsigned int i = 0; i < fft_size; i++) {
this->points[i] = points[i*2+1];
}
} else {
@@ -45,7 +45,7 @@ void WaterfallPanel::setPoints(std::vector<float> &points) {
}
void WaterfallPanel::step() {
int half_fft_size = fft_size / 2;
unsigned int half_fft_size = fft_size / 2;
if (!bufferInitialized.load()) {
delete waterfall_slice;
@@ -67,7 +67,7 @@ void WaterfallPanel::step() {
waterfall_slice[i] = (unsigned char) floor(wv * 255.0);
}
int newBufSize = (half_fft_size*lines_buffered.load()+half_fft_size);
unsigned int newBufSize = (half_fft_size*lines_buffered.load()+half_fft_size);
if (lineBuffer[j].size() < newBufSize) {
lineBuffer[j].resize(newBufSize);
rLineBuffer[j].resize(newBufSize);
src/panel/WaterfallPanel.h
+2 -2
View File
@@ -6,7 +6,7 @@
class WaterfallPanel : public GLPanel {
public:
WaterfallPanel();
void setup(int fft_size_in, int num_waterfall_lines_in);
void setup(unsigned int fft_size_in, int num_waterfall_lines_in);
void refreshTheme();
void setPoints(std::vector<float> &points);
void step();
@@ -20,7 +20,7 @@ private:
GLuint waterfall[2];
int waterfall_ofs[2];
int fft_size;
unsigned int fft_size;
int waterfall_lines;
unsigned char *waterfall_slice;
std::vector<unsigned char> lineBuffer[2];