ham-ref/satdump
1
0
Fork 0
mirror of https://github.com/SatDump/SatDump synced 2026-08-13 17:47:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a few warnings

Browse source
This commit is contained in:
Aang23 2022-08-15 17:18:22 +02:00
parent cae3c0871d
commit e1ae5bbb4e
4 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src-core/common/dsp/firdes.cpp
View file

@ -21,9 +21,7 @@ namespace dsp
int iter = i;
for (int j = 0; j <= i; j++)
{
if (u.size() <= j || v.size() <= iter)
sum;
else
if (!((int)u.size() <= j || (int)v.size() <= iter))
sum += u.at(j) * v.at(iter);
iter--;
}

12
src-core/common/image/composite.cpp
View file

@ -254,8 +254,8 @@ namespace image
{
int position = channelValues[0] * lut.width();
if (position >= lut.width())
position = lut.width() - 1;
if (position >= (int)lut.width())
position = (int)lut.width() - 1;
for (int c = 0; c < std::min(3, lut.channels()); c++)
rgb_output.channel(c)[line * img_width + pixel] = lut.channel(c)[position];
@ -265,11 +265,11 @@ namespace image
int position_x = channelValues[0] * lut.width();
int position_y = channelValues[1] * lut.height();
if (position_x >= lut.width())
position_x = lut.width() - 1;
if (position_x >= (int)lut.width())
position_x = (int)lut.width() - 1;
if (position_y >= lut.height())
position_y = lut.height() - 1;
if (position_y >= (int)lut.height())
position_y = (int)lut.height() - 1;
for (int c = 0; c < std::min(3, lut.channels()); c++)
rgb_output.channel(c)[line * img_width + pixel] = lut.channel(c)[position_y * lut.width() + position_x];

2
src-core/modules/ccsds/module_ccsds_conv_r2_concat_decoder.cpp
View file

@ -15,10 +15,10 @@ namespace ccsds
d_constellation_str(parameters["constellation"].get<std::string>()),
d_oqpsk_delay(parameters.count("oqpsk_delay") > 0 ? parameters["oqpsk_delay"].get<bool>() : false),
d_cadu_size(parameters["cadu_size"].get<int>()),
d_cadu_bytes(ceil(d_cadu_size / 8.0)), // If we can't use complete bytes, add one and padding
d_buffer_size(d_cadu_size),
d_oqpsk_delay(parameters.count("oqpsk_delay") > 0 ? parameters["oqpsk_delay"].get<bool>() : false),
d_viterbi_outsync_after(parameters["viterbi_outsync_after"].get<int>()),
d_viterbi_ber_threasold(parameters["viterbi_ber_thresold"].get<float>()),

6
src-core/modules/network/module_network_client.cpp
View file

@ -52,14 +52,14 @@ namespace network
nng_sub0_open_raw(&sock);
nng_dialer_create(&dialer, sock, std::string("tcp://" + address + ":" + std::to_string(port)).c_str());
nng_dialer_start(dialer, NULL);
nng_dialer_start(dialer, (int)NULL);
while (input_active.load())
{
size_t lpkt_size;
nng_recv(sock, buffer, &lpkt_size, NULL);
nng_recv(sock, buffer, &lpkt_size, (int)NULL);
if (pkt_size != lpkt_size)
if (pkt_size != (int)lpkt_size)
continue;
output_fifo->write(buffer, pkt_size);