diff --git a/backend/pixma.c b/backend/pixma.c index d34efbea5..e1e7ff255 100644 --- a/backend/pixma.c +++ b/backend/pixma.c @@ -1673,7 +1673,7 @@ type int resolution type string mode[30] constraint @string_list = ss->mode_list - default @s = SANE_I18N(ss->mode_list[0]) + default @s = SANE_VALUE_SCAN_MODE_COLOR title @SANE_TITLE_SCAN_MODE desc @SANE_DESC_SCAN_MODE cap soft_select soft_detect automatic diff --git a/backend/pixma_mp750.c b/backend/pixma_mp750.c index 92e180db8..6467d8241 100644 --- a/backend/pixma_mp750.c +++ b/backend/pixma_mp750.c @@ -881,7 +881,7 @@ mp750_finish_scan (pixma_t * s) case state_scanning: case state_warmup: error = abort_session (s); - if (abort_session (s) == PIXMA_ECANCELED) + if (error == PIXMA_ECANCELED) read_error_info (s, NULL, 0); /* fall through */ case state_finished: diff --git a/backend/pixma_mp810.c b/backend/pixma_mp810.c index 0204b7b4a..89d8660dd 100644 --- a/backend/pixma_mp810.c +++ b/backend/pixma_mp810.c @@ -497,6 +497,7 @@ static int has_ccd_sensor (pixma_t * s) return ((s->cfg->cap & PIXMA_CAP_CCD) != 0); } +#if 0 static int is_color (pixma_t * s) { return (s->param->mode == PIXMA_SCAN_MODE_COLOR); @@ -516,6 +517,7 @@ static int is_color_all (pixma_t * s) { return (is_color (s) || is_color_48 (s) || is_color_negative (s)); } +#endif static int is_gray (pixma_t * s) { @@ -1401,7 +1403,7 @@ static unsigned post_process_image_data (pixma_t * s, pixma_imagebuf_t * ib) mp810_t *mp = (mp810_t *) s->subdriver; unsigned c, lines, i, line_size, n, m, cw, cx, reducelines; uint8_t *sptr, *dptr, *gptr, *cptr; - unsigned color_shift, stripe_shift, stripe_shift2, jumplines /*, height*/; + unsigned /*color_shift, stripe_shift, stripe_shift2,*/ jumplines /*, height*/; int test; /* For testers: */ @@ -1456,9 +1458,9 @@ static unsigned post_process_image_data (pixma_t * s, pixma_imagebuf_t * ib) /* PDBG (pixma_dbg (4, "*post_process_image_data***** mp->color_shift = %u, mp->stripe_shift = %u, , mp->stripe_shift2 = %u ***** \n", mp->color_shift, mp->stripe_shift, mp->stripe_shift2)); */ - color_shift = mp->color_shift; - stripe_shift = mp->stripe_shift; - stripe_shift2 = mp->stripe_shift2; + /*color_shift = mp->color_shift;*/ + /*stripe_shift = mp->stripe_shift;*/ + /*stripe_shift2 = mp->stripe_shift2;*/ jumplines = mp->jumplines; /* height not needed here! */ diff --git a/backend/pixma_sane_options.c b/backend/pixma_sane_options.c index 50cb78378..946bd9d2f 100644 --- a/backend/pixma_sane_options.c +++ b/backend/pixma_sane_options.c @@ -72,7 +72,7 @@ int build_option_descriptors(struct pixma_sane_t *ss) sod->constraint_type = SANE_CONSTRAINT_STRING_LIST; sod->constraint.string_list = ss->mode_list; OPT_IN_CTX[opt_mode].info = SANE_INFO_RELOAD_PARAMS; - opt->def.s = SANE_I18N(ss->mode_list[0]); + opt->def.s = SANE_VALUE_SCAN_MODE_COLOR; opt->val.w = find_string_in_list(opt->def.s, sod->constraint.string_list); opt = &(OPT_IN_CTX[opt_source]);