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

genesys: Allocate GL646 slope tables on stack

merge-requests/82/head
Povilas Kanapickas 2019-06-08 14:04:08 +03:00
rodzic e129bdd1e1
commit 8184699bbf
2 zmienionych plików z 6 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
backend/genesys_gl646.cc
Wyświetl plik

@ -418,6 +418,7 @@ gl646_setup_registers (Genesys_Device * dev,
{
pixels = (pixels / 6) * 6;
}
/* TODO check for pixel width overflow */
uint32_t endx = startx + pixels;
bool color = params.channels == 3;
@ -2972,12 +2973,12 @@ setup_for_scan (Genesys_Device * dev,
params.color_filter = settings.color_filter;
params.flags = 0;
/* TODO check for pixel width overflow */
uint16_t slope_table0[256] = {};
uint16_t slope_table1[256] = {};
/* set up correct values for scan (gamma and shading enabled) */
status = gl646_setup_registers(dev, sensor, regs, params, settings,
dev->slope_table0, dev->slope_table1, xcorrection);
slope_table0, slope_table1, xcorrection);
if (status != SANE_STATUS_GOOD)
{
DBG(DBG_error, "%s: failed setup registers: %s\n", __func__, sane_strstatus(status));
@ -3011,7 +3012,7 @@ setup_for_scan (Genesys_Device * dev,
/* send computed slope tables */
status =
gl646_send_slope_table (dev, 0, dev->slope_table0,
gl646_send_slope_table (dev, 0, slope_table0,
sanei_genesys_read_reg_from_set (regs, 0x21));
if (status != SANE_STATUS_GOOD)
{
@ -3020,7 +3021,7 @@ setup_for_scan (Genesys_Device * dev,
}
status =
gl646_send_slope_table (dev, 1, dev->slope_table1,
gl646_send_slope_table (dev, 1, slope_table1,
sanei_genesys_read_reg_from_set (regs, 0x6b));
if (status != SANE_STATUS_GOOD)
{

2
backend/genesys_low.h
Wyświetl plik

@ -1316,8 +1316,6 @@ struct Genesys_Device
Genesys_Frontend frontend, frontend_initial;
Genesys_Gpo gpo;
Genesys_Motor motor;
uint16_t slope_table0[256] = {};
uint16_t slope_table1[256] = {};
uint8_t control[6] = {};
time_t init_date = 0;