From e94622c319e4307617b202f19d3ec05b21a9bb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 27 Sep 2015 08:20:20 +0200 Subject: merge to 1.0.25+git20150927 --- backend/pixma_imageclass.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'backend/pixma_imageclass.c') diff --git a/backend/pixma_imageclass.c b/backend/pixma_imageclass.c index f4bad37..b2d45ee 100644 --- a/backend/pixma_imageclass.c +++ b/backend/pixma_imageclass.c @@ -518,11 +518,8 @@ iclass_check_param (pixma_t * s, pixma_scan_param_t * sp) /* Some exceptions here for particular devices */ /* Those devices can scan up to Legal 14" with ADF, but A4 11.7" in flatbed */ - if (sp->source == PIXMA_SOURCE_FLATBED - && ( s->cfg->pid == MF4700_PID || - s->cfg->pid == MF4800_PID || - s->cfg->pid == MF8200_PID || - s->cfg->pid == MF8500_PID)) + /* PIXMA_CAP_ADF also works for PIXMA_CAP_ADFDUP */ + if ((s->cfg->cap & PIXMA_CAP_ADF) && sp->source == PIXMA_SOURCE_FLATBED) sp->h = MIN (sp->h, 877 * sp->xdpi / 75); return 0; -- cgit v1.2.3