From f2c663ffb1d47982b14b3310ee31c39733009123 Mon Sep 17 00:00:00 2001
From: Nicolas Martin <nicols-guest@users.alioth.debian.org>
Date: Thu, 22 Oct 2009 22:01:54 +0200
Subject: [PATCH] pixma: fix MP830 ADF shifted lines, add support for I-SENSYS
 MF4320d to pixma.desc

---
 ChangeLog                   |  4 ++++
 backend/pixma_mp150.c       | 14 ++++++++++++--
 doc/descriptions/pixma.desc | 12 ++++++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4878f721c..ccf3eb213 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-22  Nicolas Martin <nicols-guest at users.alioth.debian.org>
+	* backend/pixma_mp150.c, doc/descriptions/pixma.desc:
+	pixma: fix MP830 ADF shifted lines, add support for I-SENSYS MF4320d to descriptions.
+
 2009-10-22  Louis Lagendijk <llagendijk at users.alioth.debian.org>
 	* doc/sane-pixma.man
 	Added networking details to doc/sane-pixma.man
diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c
index eb3fd94e6..23d7a739a 100644
--- a/backend/pixma_mp150.c
+++ b/backend/pixma_mp150.c
@@ -615,11 +615,21 @@ calc_shifting (pixma_t * s)
           case MP800R_PID:
           case MP830_PID:
             mp->color_shift = s->param->ydpi / ((s->param->ydpi < 1200) ? 150 : 75);
+
             if (is_scanning_from_tpu (s)) 
               mp->color_shift = s->param->ydpi / 75;
+
             mp->shift[1] = mp->color_shift * get_cis_ccd_line_size (s);
-            mp->shift[0] = 2 * mp->shift[1];
-            mp->shift[2] = 0;
+            if (is_scanning_from_adf (s))
+              {  /* ADF */
+                mp->shift[0] = 0;
+                mp->shift[2] = 2 * mp->shift[1];
+              }
+            else
+              {  /* Flatbed or TPU */
+                mp->shift[0] = 2 * mp->shift[1];
+                mp->shift[2] = 0;
+              }
             break;
 
           case MP810_PID:
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 84507a2aa..ce9d39524 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -423,6 +423,12 @@
 :status :good
 :comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
 
+:model "imageCLASS MF4370dn"
+:interface "USB"
+:usbid "0x04a9" "0x26ec"
+:status :good
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
+
 :model "imageCLASS MF4380dn"
 :interface "USB"
 :usbid "0x04a9" "0x26ec"
@@ -441,6 +447,12 @@
 :status :good
 :comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
 
+:model "I-SENSYS MF4320d"
+:interface "USB"
+:usbid "0x04a9" "0x26ee"
+:status :good
+:comment "All resolutions supported (up to 600DPI)"
+
 :model "imageCLASS MF4010"
 :interface "USB"
 :usbid "0x04a9" "0x26b4"