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 segfault

Browse source
This commit is contained in:
ZbychuButItWasTaken 2024-09-19 17:11:36 +02:00
parent 5975709c44
commit ec04cb8cff
2 changed files with 39 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

60
plugins/noaa_metop_support/instruments/avhrr/avhrr_reader.cpp
View file

@ -75,32 +75,38 @@ namespace noaa_metop
}
}
for (int j = 0; j < 3; j++)
{
avg_blb[j] /= blb_list[j].size();
for (int k = 0; k < blb_list[j].size(); k++)
{
avg_blb[j] /= blb_list[j].size();
for (int k = 0; k < blb_list[j].size(); k++)
if (abs(blb_list[j][k] - avg_blb[j]) > BLB_LIMIT)
{
if (abs(blb_list[j][k] - avg_blb[j]) > BLB_LIMIT)
{
blb_list[j].erase(blb_list[j].begin() + k);
k--;
}
blb_list[j].erase(blb_list[j].begin() + k);
k--;
}
}
if (blb_list[j].size() != 0)
{
avg_blb[j] = 0;
for (int k = 0; k < blb_list[j].size(); k++)
{
avg_blb[j] += blb_list[j][k];
}
avg_blb[j] /= blb_list[j].size();
avg_spc[j] /= spc_list[j].size();
for (int k = 0; k < spc_list[j].size(); k++)
avg_blb[j] /= blb_list[j].size();
}
avg_spc[j] /= spc_list[j].size();
for (int k = 0; k < spc_list[j].size(); k++)
{
if (abs(spc_list[j][k] - avg_spc[j]) > SPC_LIMIT)
{
if (abs(spc_list[j][k] - avg_spc[j]) > SPC_LIMIT)
{
spc_list[j].erase(spc_list[j].begin() + k);
k--;
}
spc_list[j].erase(spc_list[j].begin() + k);
k--;
}
}
if (spc_list[j].size() != 0)
{
avg_spc[j] = 0;
for (int k = 0; k < spc_list[j].size(); k++)
{
@ -108,6 +114,7 @@ namespace noaa_metop
}
avg_spc[j] /= spc_list[j].size();
}
}
std::array<view_pair, 3> el;
for (int i = 0; i < 3; i++)
@ -180,12 +187,16 @@ namespace noaa_metop
k--;
}
}
avg_blb[j] = 0;
for (int k = 0; k < blb_list[j].size(); k++)
if (blb_list[j].size() != 0)
{
avg_blb[j] += blb_list[j][k];
avg_blb[j] = 0;
for (int k = 0; k < blb_list[j].size(); k++)
{
avg_blb[j] += blb_list[j][k];
}
avg_blb[j] /= blb_list[j].size();
}
avg_blb[j] /= blb_list[j].size();
avg_spc[j] /= spc_list[j].size();
for (int k = 0; k < spc_list[j].size(); k++)
@ -196,12 +207,15 @@ namespace noaa_metop
k--;
}
}
avg_spc[j] = 0;
for (int k = 0; k < spc_list[j].size(); k++)
if (spc_list[j].size() != 0)
{
avg_spc[j] += spc_list[j][k];
avg_spc[j] = 0;
for (int k = 0; k < spc_list[j].size(); k++)
{
avg_spc[j] += spc_list[j][k];
}
avg_spc[j] /= spc_list[j].size();
}
avg_spc[j] /= spc_list[j].size();
}
std::array<view_pair, 3> el;

4
plugins/noaa_metop_support/instruments/avhrr/avhrr_reader.h
View file

@ -7,8 +7,8 @@
#include "resources.h"
#include "common/calibration.h"
#define BLB_LIMIT 100
#define SPC_LIMIT 100
#define BLB_LIMIT 150
#define SPC_LIMIT 150
namespace noaa_metop
{