OPT_NUM_OPTS must be of type SANE_TYPE_INT.

merge-requests/1/head
Julien BLACHE 2007-10-26 14:56:38 +00:00
rodzic 6d4a3ac828
commit 7ca41423ac
19 zmienionych plików z 30 dodań i 0 usunięć

Wyświetl plik

@ -1,3 +1,12 @@
2007-10-26 Julien Blache <jb@jblache.org>
* backend/abaton.c, backend/agfafocus.c, backend/apple.c,
backend/artec.c, backend/canon.c, backend/cardscan.c,
backend/coolscan.c, backend/epson.c, backend/epson2.c,
backend/fujitsu.c, backend/hp3500.c, backend/ibm.c,
backend/pint.c, backend/ricoh.c, backend/s9036.c,
backend/sm3600.c, backend/sp15c.c, backend/tamarack.c:
OPT_NUM_OPTS must be of type SANE_TYPE_INT.
2007-10-25 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
* backend/genesys.c: Removed some more hardcoded
sizeof(Genesys_Register_Set)

Wyświetl plik

@ -647,6 +647,7 @@ init_options (Abaton_Scanner * s)
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
s->val[OPT_NUM_OPTS].w = NUM_OPTIONS;

Wyświetl plik

@ -1015,6 +1015,7 @@ init_options (AgfaFocus_Scanner * s)
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
s->val[OPT_NUM_OPTS].w = NUM_OPTIONS;

Wyświetl plik

@ -1289,6 +1289,7 @@ init_options (Apple_Scanner * s)
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
s->val[OPT_NUM_OPTS].w = NUM_OPTIONS;

Wyświetl plik

@ -2190,6 +2190,7 @@ init_options (ARTEC_Scanner * s)
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
s->val[OPT_NUM_OPTS].w = NUM_OPTIONS;

Wyświetl plik

@ -1125,6 +1125,7 @@ init_options (CANON_Scanner * s)
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
s->val[OPT_NUM_OPTS].w = NUM_OPTIONS;

Wyświetl plik

@ -490,6 +490,7 @@ attach_one (const char *device_name)
s->opt[OPT_NUM_OPTS].name = SANE_NAME_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
DBG (15, "attach_one: init settings\n");

Wyświetl plik

@ -2714,6 +2714,7 @@ init_options (Coolscan_t * scanner)
scanner->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
scanner->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
scanner->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
scanner->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
/* "Mode" group: */

Wyświetl plik

@ -2794,6 +2794,7 @@ init_options (Epson_Scanner * s)
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
s->val[OPT_NUM_OPTS].w = NUM_OPTIONS;

Wyświetl plik

@ -1633,6 +1633,7 @@ init_options(Epson_Scanner * s)
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
s->val[OPT_NUM_OPTS].w = NUM_OPTIONS;

Wyświetl plik

@ -1577,6 +1577,7 @@ init_options (struct fujitsu *s)
s->opt[OPT_NUM_OPTS].name = SANE_NAME_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
DBG (10, "init_options: finish\n");

Wyświetl plik

@ -959,6 +959,7 @@ init_options (struct hp3500_data *scanner)
opt = scanner->opt + OPT_NUM_OPTS;
opt->title = SANE_TITLE_NUM_OPTIONS;
opt->desc = SANE_DESC_NUM_OPTIONS;
opt->type = SANE_TYPE_INT;
opt->cap = SANE_CAP_SOFT_DETECT;
opt = scanner->opt + OPT_RESOLUTION;

Wyświetl plik

@ -364,6 +364,7 @@ init_options (Ibm_Scanner * s)
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
s->val[OPT_NUM_OPTS].w = NUM_OPTIONS;

Wyświetl plik

@ -387,6 +387,7 @@ init_options (PINT_Scanner *s)
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
s->val[OPT_NUM_OPTS].w = NUM_OPTIONS;

Wyświetl plik

@ -327,6 +327,7 @@ init_options (Ricoh_Scanner * s)
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
s->val[OPT_NUM_OPTS].w = NUM_OPTIONS;

Wyświetl plik

@ -680,6 +680,7 @@ init_options (S9036_Scanner * s)
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
s->val[OPT_NUM_OPTS] = NUM_OPTIONS;

Wyświetl plik

@ -186,6 +186,7 @@ InitOptions(TInstance *this)
case optCount:
pdesc->title =SANE_TITLE_NUM_OPTIONS;
pdesc->desc =SANE_DESC_NUM_OPTIONS;
pdesc->type =SANE_TYPE_INT;
pdesc->cap =SANE_CAP_SOFT_DETECT;
pval->w =(SANE_Word)optLast;
break;

Wyświetl plik

@ -45,6 +45,9 @@ static const char RCSid[] = "$Header$";
/*
* $Log$
* Revision 1.14 2007/10/26 14:56:38 jblache
* OPT_NUM_OPTS must be of type SANE_TYPE_INT.
*
* Revision 1.13 2006/03/29 20:48:50 hmg-guest
* Fixed ADF support. Patch from Andreas Degert <ad@papyrus-gmbh.de>.
*
@ -1385,6 +1388,7 @@ init_options (struct sp15c *scanner)
scanner->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
scanner->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
scanner->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
scanner->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
/************** "Mode" group: **************/

Wyświetl plik

@ -597,6 +597,7 @@ init_options (Tamarack_Scanner *s)
s->opt[OPT_NUM_OPTS].title = SANE_TITLE_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].desc = SANE_DESC_NUM_OPTIONS;
s->opt[OPT_NUM_OPTS].type = SANE_TYPE_INT;
s->opt[OPT_NUM_OPTS].cap = SANE_CAP_SOFT_DETECT;
s->val[OPT_NUM_OPTS].w = NUM_OPTIONS;