fix compile warnings

This commit is contained in:
Georgi Gerganov
2020-12-30 22:16:31 +02:00
parent 3d07c91440
commit 2bdf1f7415
2 changed files with 5 additions and 5 deletions

View File

@@ -341,7 +341,7 @@ std::string generateFileBroadcastMessage() {
// todo : to binary // todo : to binary
std::string result; std::string result;
int plen = strlen(kFileBroadcastPrefix); int plen = (int) strlen(kFileBroadcastPrefix);
result.resize(plen + 4 + 2 + 2); result.resize(plen + 4 + 2 + 2);
char *p = &result[0]; char *p = &result[0];
@@ -667,7 +667,7 @@ void renderMain() {
{ {
auto & ampl = txAmplitudeDataCurrent; auto & ampl = txAmplitudeDataCurrent;
int nBins = 512; int nBins = 512;
int nspb = ampl.size()/nBins; int nspb = (int) ampl.size()/nBins;
for (int i = 0; i < nBins; ++i) { for (int i = 0; i < nBins; ++i) {
double sum = 0.0; double sum = 0.0;
for (int j = 0; j < nspb; ++j) { for (int j = 0; j < nspb; ++j) {
@@ -1058,7 +1058,7 @@ void renderMain() {
ImGui::PlotHistogram("##plotSpectrumCurrent", ImGui::PlotHistogram("##plotSpectrumCurrent",
Funcs::Sample, Funcs::Sample,
txAmplitudeDataCurrent.data(), txAmplitudeDataCurrent.data(),
txAmplitudeDataCurrent.size(), 0, (int) txAmplitudeDataCurrent.size(), 0,
(std::string("")).c_str(), (std::string("")).c_str(),
0.0f, FLT_MAX, wSize); 0.0f, FLT_MAX, wSize);
ImGui::PopStyleColor(2); ImGui::PopStyleColor(2);
@@ -1070,7 +1070,7 @@ void renderMain() {
ImGui::PlotHistogram("##plotSpectrumCurrent", ImGui::PlotHistogram("##plotSpectrumCurrent",
Funcs::SampleFrac, Funcs::SampleFrac,
txAmplitudeDataCurrent.data(), txAmplitudeDataCurrent.data(),
txAmplitudeDataCurrent.size(), 0, (int) txAmplitudeDataCurrent.size(), 0,
(std::string("")).c_str(), (std::string("")).c_str(),
0.0f, amax, wSize); 0.0f, amax, wSize);
ImGui::PopStyleColor(2); ImGui::PopStyleColor(2);

View File

@@ -660,7 +660,7 @@ int GGWave::takeRxData(TxRxData & dst) {
int GGWave::takeTxAmplitudeData16(AmplitudeData16 & dst) { int GGWave::takeTxAmplitudeData16(AmplitudeData16 & dst) {
if (m_txAmplitudeData16.size() == 0) return 0; if (m_txAmplitudeData16.size() == 0) return 0;
auto res = m_txAmplitudeData16.size(); int res = (int) m_txAmplitudeData16.size();
dst = std::move(m_txAmplitudeData16); dst = std::move(m_txAmplitudeData16);
return res; return res;