remove undocumented and otherwise unused SANE_CAP_ALWAYS_SETTABLE

merge-requests/1/head
m. allan noah 2008-05-21 01:20:35 +00:00
rodzic 726e46456e
commit 084a18b0c4
4 zmienionych plików z 13 dodań i 12 usunięć

Wyświetl plik

@ -1,5 +1,9 @@
2008-05-20 m. allan noah <kitno455 a t gmail d o t com>
* backend/qcam.c, backend/v4l.c, frontend/tstbackend.c:
remove undocumented and otherwise unused SANE_CAP_ALWAYS_SETTABLE
2008-05-19 Stéphane Voltz <stef.dev@free.fr>
* backend/rts8891.c
* backend/rts8891.c:
150/300 dpi shading calibration fixes for 'XPA' sensor HP4470 models
2008-05-16 m. allan noah <kitno455 a t gmail d o t com>

Wyświetl plik

@ -1255,8 +1255,7 @@ init_options (QC_Scanner * s)
for (i = 0; i < NUM_OPTIONS; ++i)
{
s->opt[i].size = sizeof (SANE_Word);
s->opt[i].cap = (SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT
| SANE_CAP_ALWAYS_SETTABLE);
s->opt[i].cap = (SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT);
}
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;

Wyświetl plik

@ -261,8 +261,7 @@ init_options (V4L_Scanner * s)
for (i = 0; i < NUM_OPTIONS; ++i)
{
s->opt[i].size = sizeof (SANE_Word);
s->opt[i].cap = (SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT
| SANE_CAP_ALWAYS_SETTABLE);
s->opt[i].cap = (SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT);
}
/* Number of options */

Wyświetl plik

@ -381,13 +381,12 @@ test_options (SANE_Device * device, int can_do_recursive)
check(FATAL, (opt != NULL),
"cannot get option descriptor for option %d", option_num);
check(WRN, ((opt->cap & ~(SANE_CAP_SOFT_SELECT |
SANE_CAP_HARD_SELECT |
SANE_CAP_SOFT_DETECT |
SANE_CAP_EMULATED |
SANE_CAP_AUTOMATIC |
SANE_CAP_INACTIVE |
SANE_CAP_ADVANCED |
SANE_CAP_ALWAYS_SETTABLE)) == 0),
SANE_CAP_HARD_SELECT |
SANE_CAP_SOFT_DETECT |
SANE_CAP_EMULATED |
SANE_CAP_AUTOMATIC |
SANE_CAP_INACTIVE |
SANE_CAP_ALWAYS_ADVANCED)) == 0),
"invalid capabilities for option [%d, %s] (%x)", option_num, opt->name, opt->cap);
check(WRN, (opt->title != NULL),
"option [%d, %s] must have a title", option_num, opt->name);