mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

genesys: Fix calculation of averages during lamp warmup

merge-requests/213/head^2
Povilas Kanapickas 2020-04-09 23:57:10 +03:00
rodzic c2480ac064
commit 8b65356047
1 zmienionych plików z 9 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
backend/genesys/genesys.cpp
Wyświetl plik

@ -3428,8 +3428,6 @@ static void genesys_warmup_lamp(Genesys_Device* dev)
{ {
DBG_HELPER(dbg); DBG_HELPER(dbg);
unsigned seconds = 0; unsigned seconds = 0;
double first_average = 0;
double second_average = 0;
const auto& sensor = sanei_genesys_find_sensor_any(dev); const auto& sensor = sanei_genesys_find_sensor_any(dev);
@ -3462,18 +3460,18 @@ static void genesys_warmup_lamp(Genesys_Device* dev)
sanei_genesys_read_data_from_scanner(dev, second_line.data(), total_size); sanei_genesys_read_data_from_scanner(dev, second_line.data(), total_size);
dev->cmd_set->end_scan(dev, &dev->reg, true); dev->cmd_set->end_scan(dev, &dev->reg, true);
/* compute difference between the two scans */ // compute difference between the two scans
double first_average = 0;
double second_average = 0;
for (unsigned pixel = 0; pixel < total_size; pixel++) { for (unsigned pixel = 0; pixel < total_size; pixel++) {
// 16 bit data // 16 bit data
if (dev->session.params.depth == 16) { if (dev->session.params.depth == 16) {
first_average += (first_line[pixel] + first_line[pixel + 1] * 256); first_average += (first_line[pixel] + first_line[pixel + 1] * 256);
second_average += (second_line[pixel] + second_line[pixel + 1] * 256); second_average += (second_line[pixel] + second_line[pixel + 1] * 256);
pixel++; pixel++;
} } else {
else first_average += first_line[pixel];
{ second_average += second_line[pixel];
first_average += first_line[pixel];
second_average += second_line[pixel];
} }
} }