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

true gray improvements 

- fixed true gray resetting
- make GL646 parts use the option filter for true gray
merge-requests/1/head
Stphane Voltz 2010-01-12 21:48:06 +01:00
rodzic 802987f983
commit 9cf351b43b
2 zmienionych plików z 7 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
backend/genesys.c
Wyświetl plik

@ -5159,6 +5159,8 @@ calc_parameters (Genesys_Scanner * s)
if (strcmp (color_filter, "None") == 0)
s->dev->settings.true_gray = 1;
else
s->dev->settings.true_gray = 0;
return status;
}
@ -5466,12 +5468,6 @@ init_options (Genesys_Scanner * s)
s->val[OPT_COLOR_FILTER].s = strdup (s->opt[OPT_COLOR_FILTER].constraint.string_list[0]);
}
/* for GL646 cis scanners we're using true gray so ther is no filter */
if (model->asic_type == GENESYS_GL646 && model->is_cis)
{
s->opt[OPT_COLOR_FILTER].cap = SANE_CAP_INACTIVE;
}
/* Powersave time (turn lamp off) */
s->opt[OPT_LAMP_OFF_TIME].name = "lamp-off-time";
s->opt[OPT_LAMP_OFF_TIME].title = SANE_I18N ("Lamp off time");

10
backend/genesys_gl646.c
Wyświetl plik

@ -903,7 +903,7 @@ gl646_setup_registers (Genesys_Device * dev,
regs[reg_0x05].value &= ~REG05_GMMENB;
/* true CIS gray if needed */
if (dev->model->is_cis == SANE_TRUE && color == SANE_FALSE)
if (dev->model->is_cis == SANE_TRUE && dev->settings.true_gray)
{
regs[reg_0x05].value |= REG05_LEDADD;
}
@ -5058,12 +5058,12 @@ gl646_search_strip (Genesys_Device * dev, SANE_Bool forward, SANE_Bool black)
{
found = 1;
DBG (DBG_data,
"gl841_search_strip: strip found forward during pass %d at line %d\n",
"gl646_search_strip: strip found forward during pass %d at line %d\n",
pass, y);
}
else
{
DBG (DBG_data, "gl841_search_strip: pixels=%d, count=%d\n",
DBG (DBG_data, "gl646_search_strip: pixels=%d, count=%d\n",
settings.pixels, count);
}
}
@ -5096,12 +5096,12 @@ gl646_search_strip (Genesys_Device * dev, SANE_Bool forward, SANE_Bool black)
{
found = 1;
DBG (DBG_data,
"gl841_search_strip: strip found backward during pass %d \n",
"gl646_search_strip: strip found backward during pass %d \n",
pass);
}
else
{
DBG (DBG_data, "gl841_search_strip: pixels=%d, count=%d\n",
DBG (DBG_data, "gl646_search_strip: pixels=%d, count=%d\n",
settings.pixels, count);
}
}