Merge branch 'master' of ssh://git.debian.org/git/sane/sane-backends

ChangeLog

@@ -1,3 +1,9 @@
+2014-02-08 Rolf Bensch <rolf at bensch hyphen online dot de>
+	* backend/pixma_mp150.c:
+	- Canon Pixma MX510 Series supports 14" legal paper size in ADF mode.
+	* doc/descriptions/pixma.desc, doc/sane-pixma.man:
+	- Canon Pixma MX510 Series is working, reported by sebastien_gd.
+
 2014-01-29 m. allan noah <kitno455 at gmail dot com>
 	* backend/umax-uc630.c: updates from Ondrej Zary
 

backend/pixma_mp150.c

@@ -1279,6 +1279,7 @@ mp150_check_param (pixma_t * s, pixma_scan_param_t * sp)
         s->cfg->pid == MX360_PID ||
         s->cfg->pid == MX410_PID ||
         s->cfg->pid == MX420_PID ||
+        s->cfg->pid == MX510_PID ||
         s->cfg->pid == MX920_PID ||
         s->cfg->pid == MX7600_PID )
        &&
@@ -1715,7 +1716,7 @@ const pixma_config_t pixma_mp150_devices[] = {
   /* Latest devices (2012) Generation 4 CIS */
   DEVICE ("Canon PIXMA MX370 Series", "MX370", MX370_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA MX430 Series", "MX430", MX430_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
-  DEVICE ("Canon PIXMA MX510 Series", "MX510", MX510_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+  DEVICE ("Canon PIXMA MX510 Series", "MX510", MX510_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA MX710 Series", "MX710", MX710_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP),
   DEVICE ("Canon PIXMA MX890 Series", "MX890", MX890_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP),
   DEVICE ("Canon PIXMA E600 Series",  "E600",  E600_PID,  1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),

doc/descriptions/pixma.desc

@@ -586,8 +586,8 @@
 :model "PIXMA MX510 Series"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x175c"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI). ADF empty buggy."
 
 :model "PIXMA MX520 Series"
 :interface "USB"

doc/sane-pixma.man

@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "02 Jan 2014" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "08 Feb 2014" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
 sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
@@ -39,7 +39,7 @@ PIXMA MP960, MP970, MP980, MP990
 .br
 PIXMA MX300, MX310, MX330, MX340, MX350, MX360, MX370
 .br
-PIXMA MX420, MX700, MX7600
+PIXMA MX420, MX510, MX700, MX7600
 .br
 PIXMA MX850, MX860, MX870, MX882, MX885, MX890, MX920
 .br
@@ -85,7 +85,7 @@ PIXMA MG6400, MG6500, MG7100, MG8100
 .br
 PIXMA MP375R, MP493, MP495, MP740
 .br
-PIXMA MX320, MX390, MX410, MX430, MX450, MX510, MX520
+PIXMA MX320, MX390, MX410, MX430, MX450, MX520
 .br
 PIXMA MX710, MX720
 .br