From 0b482a02730f6003f753b379a453519a73c29506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Voltz?= Date: Thu, 25 Feb 2010 20:52:39 +0100 Subject: [PATCH] fix regression for gl646 CCD based scanners --- ChangeLog | 4 ++++ backend/genesys_gl646.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 466bb7fc9..e2450dac9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-02-25 Stéphane Voltz + * backend/genesys_gl646.c: fix regression for gl646 CCD scanners due + to incorrect color filter setting. + 2010-02-23 Stéphane Voltz * backend/genesys.c backend/genesys_devices.c backend/genesys_gl646.c backend/genesys_gl646.h: XP200 calibration rework. Some HP3670 diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c index c9ca46584..155763369 100644 --- a/backend/genesys_gl646.c +++ b/backend/genesys_gl646.c @@ -3410,7 +3410,7 @@ setup_for_scan (Genesys_Device * dev, Genesys_Settings settings, /* select color filter based on settings */ dev->reg[reg_0x04].value &= ~REG04_FILTER; - if(channels>1) + if(channels==1) { switch (settings.color_filter) {