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

Used new lamp option from saneopts.h.

merge-requests/1/head
Henning Geinitz 2004-10-03 10:54:57 +00:00
rodzic 53ab3cc90e
commit 59b80e8c46
3 zmienionych plików z 18 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
ChangeLog
Wyświetl plik

@ -1,6 +1,11 @@
2004-10-03 Henning Meier-Geinitz <henning@meier-geinitz.de>
* doc/descriptions/unsupported.desc: Added Nikon LS-5000 ED.
* doc/descriptions/unsupported.desc: Added Nikon LS-5000 ED (bug
#300972).
* include/sane/saneopts.h: Added option for turning off the
scanner's lamp on exit.
* backend/gt68xx.c backend/gt68xx_high.h: Used new lamp option
from saneopts.h.
2004-10-02 Thomas Soumarmon <thomas.soumarmon@cogitae.net>

23
backend/gt68xx.c
Wyświetl plik

@ -490,16 +490,15 @@ init_options (GT68xx_Scanner * s)
s->val[OPT_PREVIEW].w = SANE_FALSE;
/* lamp on */
s->opt[OPT_LAMP_ON].name = "lamp-on";
s->opt[OPT_LAMP_ON].title = SANE_I18N ("Lamp always on");
s->opt[OPT_LAMP_ON].desc =
SANE_I18N ("Don't turn off the lamp after leaving the frontend.");
s->opt[OPT_LAMP_ON].type = SANE_TYPE_BOOL;
s->opt[OPT_LAMP_ON].unit = SANE_UNIT_NONE;
s->opt[OPT_LAMP_ON].constraint_type = SANE_CONSTRAINT_NONE;
s->val[OPT_LAMP_ON].w = SANE_FALSE;
s->opt[OPT_LAMP_OFF_AT_EXIT].name = SANE_NAME_LAMP_OFF_AT_EXIT;
s->opt[OPT_LAMP_OFF_AT_EXIT].title = SANE_TITLE_LAMP_OFF_AT_EXIT;
s->opt[OPT_LAMP_OFF_AT_EXIT].desc = SANE_DESC_LAMP_OFF_AT_EXIT;
s->opt[OPT_LAMP_OFF_AT_EXIT].type = SANE_TYPE_BOOL;
s->opt[OPT_LAMP_OFF_AT_EXIT].unit = SANE_UNIT_NONE;
s->opt[OPT_LAMP_OFF_AT_EXIT].constraint_type = SANE_CONSTRAINT_NONE;
s->val[OPT_LAMP_OFF_AT_EXIT].w = SANE_TRUE;
if (s->dev->model->is_cis && !(s->dev->model->flags & GT68XX_FLAG_CIS_LAMP))
DISABLE (OPT_LAMP_ON);
DISABLE (OPT_LAMP_OFF_AT_EXIT);
/* bit depth */
s->opt[OPT_BIT_DEPTH].name = SANE_NAME_BIT_DEPTH;
@ -1428,7 +1427,7 @@ sane_close (SANE_Handle handle)
else
first_handle = s->next;
if (s->val[OPT_LAMP_ON].w == SANE_FALSE)
if (s->val[OPT_LAMP_OFF_AT_EXIT].w == SANE_TRUE)
gt68xx_device_lamp_control (s->dev, SANE_FALSE, SANE_FALSE);
gt68xx_device_deactivate (s->dev);
gt68xx_device_close (s->dev);
@ -1507,7 +1506,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
case OPT_BACKTRACK:
case OPT_BACKTRACK_LINES:
case OPT_PREVIEW:
case OPT_LAMP_ON:
case OPT_LAMP_OFF_AT_EXIT:
case OPT_AUTO_WARMUP:
case OPT_GAMMA_VALUE:
case OPT_THRESHOLD:
@ -1560,7 +1559,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
RIE (calc_parameters (s));
myinfo |= SANE_INFO_RELOAD_PARAMS;
break;
case OPT_LAMP_ON:
case OPT_LAMP_OFF_AT_EXIT:
case OPT_AUTO_WARMUP:
case OPT_COARSE_CAL_ONCE:
case OPT_BACKTRACK_LINES:

2
backend/gt68xx_high.h
Wyświetl plik

@ -192,7 +192,7 @@ enum GT68xx_Option
OPT_PREVIEW,
OPT_BIT_DEPTH,
OPT_RESOLUTION,
OPT_LAMP_ON,
OPT_LAMP_OFF_AT_EXIT,
OPT_BACKTRACK,
OPT_DEBUG_GROUP,