diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-27 08:20:20 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-09-27 08:20:20 +0200 |
| commit | e94622c319e4307617b202f19d3ec05b21a9bb49 (patch) | |
| tree | c5ddf44352b9bd47aeb3eb432ba79638079efe25 /backend/pixma_mp150.c | |
| parent | 6f2255c9648b175d51e2c8e5e9670557f9dc4ee1 (diff) | |
merge to 1.0.25+git20150927
Diffstat (limited to 'backend/pixma_mp150.c')
| -rw-r--r-- | backend/pixma_mp150.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c index 79711fe..4f8b232 100644 --- a/backend/pixma_mp150.c +++ b/backend/pixma_mp150.c @@ -227,6 +227,7 @@ /* 2015 new devices (untested) */ #define MX490_PID 0x1787 #define E480_PID 0x1789 +#define MG3600_PID 0x178a /* Generation 4 XML messages that encapsulates the Pixma protocol messages */ @@ -1154,7 +1155,8 @@ post_process_image_data (pixma_t * s, pixma_imagebuf_t * ib) && s->cfg->pid != MG5500_PID && s->cfg->pid != MG6300_PID && s->cfg->pid != MG6400_PID - && s->cfg->pid != MG7100_PID) + && s->cfg->pid != MG7100_PID + && s->cfg->pid != MG7500_PID) reorder_pixels (mp->linebuf, sptr, c, n, m, s->param->wx, line_size); /* Crop line to selected borders */ @@ -1825,6 +1827,7 @@ const pixma_config_t pixma_mp150_devices[] = { /* Latest devices (2015) Generation 4 CIS */ DEVICE ("Canon PIXMA MX490 Series", "MX490", MX490_PID, 600, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF), DEVICE ("Canon PIXMA E480 Series", "E480", E480_PID, 600, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF), + DEVICE ("Canon PIXMA MG3600 Series", "MG3600", MG3600_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), END_OF_DEVICE_LIST }; |