From 7ca41423ac7710b29d7230c12a255ae5ff4047a5 Mon Sep 17 00:00:00 2001 From: Julien BLACHE Date: Fri, 26 Oct 2007 14:56:38 +0000 Subject: [PATCH] OPT_NUM_OPTS must be of type SANE_TYPE_INT. --- ChangeLog | 9 +++++++++ backend/abaton.c | 1 + backend/agfafocus.c | 1 + backend/apple.c | 1 + backend/artec.c | 1 + backend/canon.c | 1 + backend/cardscan.c | 1 + backend/coolscan.c | 1 + backend/epson.c | 1 + backend/epson2.c | 1 + backend/fujitsu.c | 1 + backend/hp3500.c | 1 + backend/ibm.c | 1 + backend/pint.c | 1 + backend/ricoh.c | 1 + backend/s9036.c | 1 + backend/sm3600.c | 1 + backend/sp15c.c | 4 ++++ backend/tamarack.c | 1 + 19 files changed, 30 insertions(+) diff --git a/ChangeLog b/ChangeLog index 449e2932e..b0aac4eda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-10-26 Julien Blache + * 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 * backend/genesys.c: Removed some more hardcoded sizeof(Genesys_Register_Set) diff --git a/backend/abaton.c b/backend/abaton.c index d6caf0629..2eb877d34 100644 --- a/backend/abaton.c +++ b/backend/abaton.c @@ -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; diff --git a/backend/agfafocus.c b/backend/agfafocus.c index 8714acdd6..b2d27d0f9 100644 --- a/backend/agfafocus.c +++ b/backend/agfafocus.c @@ -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; diff --git a/backend/apple.c b/backend/apple.c index 54206a74a..01b39b0c8 100644 --- a/backend/apple.c +++ b/backend/apple.c @@ -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; diff --git a/backend/artec.c b/backend/artec.c index cbfa71695..b34132164 100644 --- a/backend/artec.c +++ b/backend/artec.c @@ -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; diff --git a/backend/canon.c b/backend/canon.c index 055b49de4..c9c236de9 100644 --- a/backend/canon.c +++ b/backend/canon.c @@ -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; diff --git a/backend/cardscan.c b/backend/cardscan.c index 7849416e0..9ac7fe267 100644 --- a/backend/cardscan.c +++ b/backend/cardscan.c @@ -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"); diff --git a/backend/coolscan.c b/backend/coolscan.c index 9468deaf9..6b9dab3b4 100644 --- a/backend/coolscan.c +++ b/backend/coolscan.c @@ -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: */ diff --git a/backend/epson.c b/backend/epson.c index dafc3fbd5..509794a48 100644 --- a/backend/epson.c +++ b/backend/epson.c @@ -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; diff --git a/backend/epson2.c b/backend/epson2.c index 1a95363eb..62f7af495 100644 --- a/backend/epson2.c +++ b/backend/epson2.c @@ -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; diff --git a/backend/fujitsu.c b/backend/fujitsu.c index 32b0bb489..a912ee74c 100644 --- a/backend/fujitsu.c +++ b/backend/fujitsu.c @@ -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"); diff --git a/backend/hp3500.c b/backend/hp3500.c index 32feda5e7..4a0d8336e 100644 --- a/backend/hp3500.c +++ b/backend/hp3500.c @@ -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; diff --git a/backend/ibm.c b/backend/ibm.c index 005220918..2bb32d32a 100644 --- a/backend/ibm.c +++ b/backend/ibm.c @@ -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; diff --git a/backend/pint.c b/backend/pint.c index b7d742f6f..cda7ca9b2 100644 --- a/backend/pint.c +++ b/backend/pint.c @@ -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; diff --git a/backend/ricoh.c b/backend/ricoh.c index e00d117ac..8f80e1b0d 100644 --- a/backend/ricoh.c +++ b/backend/ricoh.c @@ -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; diff --git a/backend/s9036.c b/backend/s9036.c index 23f74ba3a..bc414c0ce 100644 --- a/backend/s9036.c +++ b/backend/s9036.c @@ -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; diff --git a/backend/sm3600.c b/backend/sm3600.c index f6cc558c7..09ebb0fd3 100644 --- a/backend/sm3600.c +++ b/backend/sm3600.c @@ -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; diff --git a/backend/sp15c.c b/backend/sp15c.c index b54c21a52..e1b0f3ecb 100644 --- a/backend/sp15c.c +++ b/backend/sp15c.c @@ -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 . * @@ -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: **************/ diff --git a/backend/tamarack.c b/backend/tamarack.c index 8fbc4a678..df11baee6 100644 --- a/backend/tamarack.c +++ b/backend/tamarack.c @@ -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;