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

genesys: Pass sensor to genesys_average_white() as param

merge-requests/81/head
Povilas Kanapickas 2019-06-02 11:47:45 +03:00
rodzic 35e45196b9
commit 60289d58e2
1 zmienionych plików z 5 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
backend/genesys.cc
Wyświetl plik

@ -1293,7 +1293,7 @@ genesys_adjust_gain (double *applied_multi,
/* todo: is return status necessary (unchecked?) */ /* todo: is return status necessary (unchecked?) */
static SANE_Status static SANE_Status
genesys_average_white (Genesys_Device * dev, int channels, int channel, genesys_average_white (Genesys_Device * dev, Genesys_Sensor& sensor, int channels, int channel,
uint8_t * data, int size, int *max_average) uint8_t * data, int size, int *max_average)
{ {
int gain_white_ref, sum, range; int gain_white_ref, sum, range;
@ -1305,9 +1305,9 @@ genesys_average_white (Genesys_Device * dev, int channels, int channel,
range = size / 50; range = size / 50;
if (dev->settings.scan_method == SCAN_METHOD_TRANSPARENCY) /* transparency mode */ if (dev->settings.scan_method == SCAN_METHOD_TRANSPARENCY) /* transparency mode */
gain_white_ref = dev->sensor.fau_gain_white_ref * 256; gain_white_ref = sensor.fau_gain_white_ref * 256;
else else
gain_white_ref = dev->sensor.gain_white_ref * 256; gain_white_ref = sensor.gain_white_ref * 256;
if (range < 1) if (range < 1)
range = 1; range = 1;
@ -1587,7 +1587,7 @@ genesys_coarse_calibration (Genesys_Device * dev)
{ {
for (j = 0; j < 3; j++) for (j = 0; j < 3; j++)
{ {
genesys_average_white (dev, 3, j, calibration_data.data(), size, genesys_average_white (dev, dev->sensor, 3, j, calibration_data.data(), size,
&white_average); &white_average);
white[i * 3 + j] = white_average; white[i * 3 + j] = white_average;
dark[i * 3 + j] = dark[i * 3 + j] =
@ -1599,7 +1599,7 @@ genesys_coarse_calibration (Genesys_Device * dev)
} }
else /* one color-component modes */ else /* one color-component modes */
{ {
genesys_average_white (dev, 1, 0, calibration_data.data(), size, genesys_average_white (dev, dev->sensor, 1, 0, calibration_data.data(), size,
&white_average); &white_average);
white[i * 3 + 0] = white[i * 3 + 1] = white[i * 3 + 2] = white[i * 3 + 0] = white[i * 3 + 1] = white[i * 3 + 2] =
white_average; white_average;