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

Removed hardcoded option size.

RELEASE_1_0_11_BRANCH
Henning Geinitz 2003-01-10 17:15:12 +00:00
rodzic b604106a48
commit 1652b580a4
2 zmienionych plików z 3 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
ChangeLog
Wyświetl plik

@ -7,6 +7,7 @@
* TODO: Removed microtek2 problem, updated Irix patch section and * TODO: Removed microtek2 problem, updated Irix patch section and
Linux/Sparc section. Linux/Sparc section.
* NEWS: Updated for 1.0.10. * NEWS: Updated for 1.0.10.
* backend/mustek.c: Removed hardcoded option size.
2003-01-10 Gerhard Jaeger <gerhard@gjaeger.de> 2003-01-10 Gerhard Jaeger <gerhard@gjaeger.de>

3
backend/mustek.c
Wyświetl plik

@ -4460,7 +4460,6 @@ init_options (Mustek_Scanner * s)
s->opt[OPT_HALFTONE_PATTERN].title = SANE_TITLE_HALFTONE_PATTERN; s->opt[OPT_HALFTONE_PATTERN].title = SANE_TITLE_HALFTONE_PATTERN;
s->opt[OPT_HALFTONE_PATTERN].desc = SANE_DESC_HALFTONE_PATTERN; s->opt[OPT_HALFTONE_PATTERN].desc = SANE_DESC_HALFTONE_PATTERN;
s->opt[OPT_HALFTONE_PATTERN].type = SANE_TYPE_INT; s->opt[OPT_HALFTONE_PATTERN].type = SANE_TYPE_INT;
s->opt[OPT_HALFTONE_PATTERN].size = 4;
s->opt[OPT_HALFTONE_PATTERN].cap |= SANE_CAP_INACTIVE; s->opt[OPT_HALFTONE_PATTERN].cap |= SANE_CAP_INACTIVE;
s->opt[OPT_HALFTONE_PATTERN].constraint_type = SANE_CONSTRAINT_RANGE; s->opt[OPT_HALFTONE_PATTERN].constraint_type = SANE_CONSTRAINT_RANGE;
s->opt[OPT_HALFTONE_PATTERN].constraint.range = &u8_range; s->opt[OPT_HALFTONE_PATTERN].constraint.range = &u8_range;
@ -5868,6 +5867,8 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
if (s->custom_halftone_pattern) if (s->custom_halftone_pattern)
{ {
s->opt[OPT_HALFTONE_PATTERN].cap &= ~SANE_CAP_INACTIVE; s->opt[OPT_HALFTONE_PATTERN].cap &= ~SANE_CAP_INACTIVE;
/* BUG: The SANE standard does nor allow to change the option
size at run time */
s->opt[OPT_HALFTONE_PATTERN].size = s->opt[OPT_HALFTONE_PATTERN].size =
(s->halftone_pattern_type & 0x0f) * sizeof (SANE_Word); (s->halftone_pattern_type & 0x0f) * sizeof (SANE_Word);
} }