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

use LINESEL in all cases fro GL124

merge-requests/1/head
Stphane Voltz 2013-07-09 06:59:56 +02:00
rodzic 599f3ed875
commit c883036e43
1 zmienionych plików z 13 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

24
backend/genesys_gl124.c
Wyświetl plik

@ -950,13 +950,14 @@ gl124_init_motor_regs_scan (Genesys_Device * dev,
if(dev->line_interp>0) if(dev->line_interp>0)
{ {
lincnt=scan_lines*dev->line_interp; lincnt=scan_lines*(dev->line_interp+1);
} }
else else
{ {
lincnt=scan_lines; lincnt=scan_lines;
} }
/* enforce motor minimal scan speed */
yres=scan_yres; yres=scan_yres;
if ((scan_mode == SCAN_MODE_COLOR) && (yres<900)) if ((scan_mode == SCAN_MODE_COLOR) && (yres<900))
{ {
@ -964,10 +965,10 @@ gl124_init_motor_regs_scan (Genesys_Device * dev,
} }
if ((scan_mode != SCAN_MODE_COLOR) && (yres<300)) if ((scan_mode != SCAN_MODE_COLOR) && (yres<300))
{ {
scan_dummy=dev->line_interp-1;
dev->line_interp=0;
yres=300; yres=300;
} }
scan_dummy=dev->line_interp;
dev->line_interp=0;
sanei_genesys_set_triple(reg,REG_LINCNT,lincnt); sanei_genesys_set_triple(reg,REG_LINCNT,lincnt);
DBG (DBG_io, "%s: lincnt=%d\n", __FUNCTION__, lincnt); DBG (DBG_io, "%s: lincnt=%d\n", __FUNCTION__, lincnt);
@ -1390,15 +1391,16 @@ gl124_init_optical_regs_scan (Genesys_Device * dev,
* motor dpi then discard lines to match taget * motor dpi then discard lines to match taget
* resolution, so lincnt has to be updated * resolution, so lincnt has to be updated
*/ */
dev->line_interp = 300/dpiset; dev->line_interp = 300/dpiset-1;
} }
DBG (DBG_io2, "%s: used_pixels=%d\n", __FUNCTION__, used_pixels); DBG (DBG_io2, "%s: used_pixels =%d\n", __FUNCTION__, used_pixels);
DBG (DBG_io2, "%s: pixels =%d\n", __FUNCTION__, pixels); DBG (DBG_io2, "%s: pixels =%d\n", __FUNCTION__, pixels);
DBG (DBG_io2, "%s: depth =%d\n", __FUNCTION__, depth); DBG (DBG_io2, "%s: depth =%d\n", __FUNCTION__, depth);
DBG (DBG_io2, "%s: dev->bpl =%lu\n", __FUNCTION__, (unsigned long)dev->bpl); DBG (DBG_io2, "%s: dev->bpl =%lu\n", __FUNCTION__, (unsigned long)dev->bpl);
DBG (DBG_io2, "%s: dev->len =%lu\n", __FUNCTION__, (unsigned long)dev->len); DBG (DBG_io2, "%s: dev->len =%lu\n", __FUNCTION__, (unsigned long)dev->len);
DBG (DBG_io2, "%s: dev->dist =%lu\n", __FUNCTION__, (unsigned long)dev->dist); DBG (DBG_io2, "%s: dev->dist =%lu\n", __FUNCTION__, (unsigned long)dev->dist);
DBG (DBG_io2, "%s: dev->line_interp=%lu\n", __FUNCTION__, (unsigned long)dev->dist);
words_per_line *= channels; words_per_line *= channels;
dev->wpl = words_per_line; dev->wpl = words_per_line;