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

enable gamma only at scan time

merge-requests/1/head
Stphane Voltz 2014-05-12 21:46:50 +02:00
rodzic cced79e963
commit 0694698fd8
2 zmienionych plików z 18 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ChangeLog
Wyświetl plik

@ -1,3 +1,8 @@
2014-05-13 Stéphane Voltz <stef.dev@free.fr>
* backend/genesys_gl646.[ch] backend/genesys.c backend/genesys_low.c:
fix bug #314663. Set gamma for gl646 devices only at scan time. Reset
endpoint each time before leaving.
2014-05-08 Rolf Bensch <rolf at bensch hyphen online dot de> 2014-05-08 Rolf Bensch <rolf at bensch hyphen online dot de>
* backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.7 * backend/pixma.h, doc/descriptions/pixma.desc: Pixma backend version 0.17.7
* backend/pixma_mp150.c: * backend/pixma_mp150.c:

24
backend/genesys_gl646.c
Wyświetl plik

@ -985,10 +985,8 @@ gl646_setup_registers (Genesys_Device * dev,
/* gamma enable for scans */ /* gamma enable for scans */
if (dev->model->flags & GENESYS_FLAG_14BIT_GAMMA) if (dev->model->flags & GENESYS_FLAG_14BIT_GAMMA)
regs[reg_0x05].value |= REG05_GMM14BIT; regs[reg_0x05].value |= REG05_GMM14BIT;
if (depth < 16)
regs[reg_0x05].value |= REG05_GMMENB; regs[reg_0x05].value &= ~REG05_GMMENB;
else
regs[reg_0x05].value &= ~REG05_GMMENB;
/* true CIS gray if needed */ /* true CIS gray if needed */
if (dev->model->is_cis == SANE_TRUE && color == SANE_FALSE if (dev->model->is_cis == SANE_TRUE && color == SANE_FALSE
@ -3381,20 +3379,24 @@ gl646_init_regs_for_scan (Genesys_Device * dev)
{ {
SANE_Status status; SANE_Status status;
DBGSTART;
/* park head after calibration if needed */ /* park head after calibration if needed */
if (dev->scanhead_position_in_steps > 0 if (dev->scanhead_position_in_steps > 0
&& dev->settings.scan_method == SCAN_METHOD_FLATBED) && dev->settings.scan_method == SCAN_METHOD_FLATBED)
{ {
status = gl646_slow_back_home (dev, SANE_TRUE); RIE(gl646_slow_back_home (dev, SANE_TRUE));
if (status != SANE_STATUS_GOOD)
{
return status;
}
dev->scanhead_position_in_steps = 0; dev->scanhead_position_in_steps = 0;
} }
return setup_for_scan (dev, dev->reg, dev->settings, SANE_FALSE, SANE_TRUE, SANE_TRUE); RIE(setup_for_scan (dev, dev->reg, dev->settings, SANE_FALSE, SANE_TRUE, SANE_TRUE));
/* gamma is only enabled at final scan time */
if (dev->settings.depth < 16)
dev->reg[reg_0x05].value |= REG05_GMMENB;
DBGCOMPLETED;
return status;
} }
/** /**