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

genesys: Support custom shading offset on gl843

merge-requests/213/head^2
Povilas Kanapickas 2020-04-13 07:38:00 +03:00
rodzic 4b79620525
commit 6fea625ad6
1 zmienionych plików z 10 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
backend/genesys/gl843.cpp
Wyświetl plik

@ -1964,7 +1964,7 @@ void CommandSetGl843::send_shading_data(Genesys_Device* dev, const Genesys_Senso
uint8_t *buffer; uint8_t *buffer;
int count; int count;
unsigned offset = 0; int offset = 0;
unsigned length = size; unsigned length = size;
if (dev->reg.get8(REG_0x01) & REG_0x01_SHDAREA) { if (dev->reg.get8(REG_0x01) & REG_0x01_SHDAREA) {
@ -1974,9 +1974,13 @@ void CommandSetGl843::send_shading_data(Genesys_Device* dev, const Genesys_Senso
length = dev->session.output_pixels * sensor.shading_resolution / length = dev->session.output_pixels * sensor.shading_resolution /
dev->session.params.xres; dev->session.params.xres;
offset += sensor.shading_pixel_offset;
// 16 bit words, 2 words per color, 3 color channels // 16 bit words, 2 words per color, 3 color channels
length *= 2 * 2 * 3; length *= 2 * 2 * 3;
offset *= 2 * 2 * 3; offset *= 2 * 2 * 3;
} else {
offset += sensor.shading_pixel_offset * 2 * 2 * 3;
} }
dev->interface->record_key_value("shading_offset", std::to_string(offset)); dev->interface->record_key_value("shading_offset", std::to_string(offset));
@ -1990,6 +1994,11 @@ void CommandSetGl843::send_shading_data(Genesys_Device* dev, const Genesys_Senso
/* copy regular shading data to the expected layout */ /* copy regular shading data to the expected layout */
buffer = final_data.data(); buffer = final_data.data();
count = 0; count = 0;
if (offset < 0) {
count += (-offset);
length -= (-offset);
offset = 0;
}
/* loop over calibration data */ /* loop over calibration data */
for (i = 0; i < length; i++) for (i = 0; i < length; i++)