From 54358f27e1d6cf8b537866d8034919fcbebea1f1 Mon Sep 17 00:00:00 2001 From: Rolf Bensch Date: Thu, 18 Sep 2014 21:54:28 +0200 Subject: [PATCH] Canon Pixma MG5500 Series is working --- ChangeLog | 4 ++++ backend/pixma_mp150.c | 1 + doc/descriptions/pixma.desc | 6 +++--- doc/sane-pixma.man | 6 +++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a3456acf..479b6cab4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-09-18 Rolf Bensch + * backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man: + Canon Pixma MG5500 Series is working, bug #314819. + 2014-09-16 Rolf Bensch * doc/descriptions/pixma.desc, doc/sane-pixma.man: Canon Pixma MG2400 Series is working, reported by Marcus Wellnitz. diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c index d06904c9a..4d7096f97 100644 --- a/backend/pixma_mp150.c +++ b/backend/pixma_mp150.c @@ -1137,6 +1137,7 @@ post_process_image_data (pixma_t * s, pixma_imagebuf_t * ib) && s->cfg->pid != MG3100_PID && s->cfg->pid != MG2100_PID && s->cfg->pid != MG5300_PID + && s->cfg->pid != MG5500_PID && s->cfg->pid != MG6300_PID && s->cfg->pid != MG7100_PID) reorder_pixels (mp->linebuf, sptr, c, n, m, s->param->wx, line_size); diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc index e7a2778f6..d8d061e2b 100644 --- a/doc/descriptions/pixma.desc +++ b/doc/descriptions/pixma.desc @@ -139,10 +139,10 @@ :comment "Testers needed!" :model "PIXMA MG5500 Series" -:interface "USB" +:interface "USB WiFi" :usbid "0x04a9" "0x1771" -:status :untested -:comment "Testers needed!" +:status :complete +:comment "All resolutions supported (up to 1200DPI)." :model "PIXMA MG6100 Series" :interface "USB" diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man index ff6d9bb1b..0e9dc4f81 100644 --- a/doc/sane-pixma.man +++ b/doc/sane-pixma.man @@ -1,4 +1,4 @@ -.TH "sane\-pixma" "5" "16 Sep 2014" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" +.TH "sane\-pixma" "5" "18 Sep 2014" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy" .IX sane\-pixma .SH NAME sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners @@ -17,7 +17,7 @@ Currently, the following models work with this backend: .RS PIXMA MG2100, MG2400, MG3100, MG3200, MG4200, MG5100, MG5200 .br -PIXMA MG5300, MG6100, MG6200, MG6300, MG7100, MG8200 +PIXMA MG5300, MG5500, MG6100, MG6200, MG6300, MG7100, MG8200 .br PIXMA MP140, MP150, MP160, MP170, MP180, MP190 .br @@ -77,7 +77,7 @@ Feedback in the sane\-devel mailing list welcome. .RS PIXMA E400, E500, E510, E560, E600, E610 .br -PIXMA MG2200, MG2500, MG4100, MG5400, MG5500 +PIXMA MG2200, MG2500, MG4100, MG5400 .br PIXMA MG6400, MG6500, MG8100 .br