mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

pixma backend: added debug info for MF3110 and changed default params.

merge-requests/1/head
Nicolas Martin 2009-09-07 22:02:47 +02:00
rodzic 24d73f8fe6
commit 3b9fec8c9b
2 zmienionych plików z 9 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
ChangeLog
Wyświetl plik

@ -1,3 +1,7 @@
2009-09-07 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp730.c:
pixma backend: added debug info for MF3110 and changed default params.
2009-09-06 Nicolas Martin <nicols-guest at users.alioth.debian.org> 2009-09-06 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp730.c, backend/pixma_imageclass.c, backend/pixma_mp150.c, * backend/pixma_mp730.c, backend/pixma_imageclass.c, backend/pixma_mp150.c,
doc/descriptions/pixma.desc, doc/sane-pixma.man: doc/descriptions/pixma.desc, doc/sane-pixma.man:

8
backend/pixma_mp730.c
Wyświetl plik

@ -616,12 +616,14 @@ mp730_fill_buffer (pixma_t * s, pixma_imagebuf_t * ib)
s->cfg->pid != MF5770_PID && s->cfg->pid != MF5770_PID &&
s->cfg->pid != MF3110_PID) s->cfg->pid != MF3110_PID)
{ {
/* color, and not an MF57x0 */ /* color, and not an MF57x0 nor MF3110 */
PDBG (pixma_dbg (1, "DEBUG: Packing colors\n"));
pack_rgb (mp->imgbuf, n, mp->raw_width, mp->lbuf); pack_rgb (mp->imgbuf, n, mp->raw_width, mp->lbuf);
} }
else else
{ {
/* grayscale or MF57x0 */ /* grayscale or MF57x0 or MF3110 */
PDBG (pixma_dbg (1, "DEBUG: not processing colors\n"));
memcpy (mp->lbuf, mp->imgbuf, n * s->param->line_size); memcpy (mp->lbuf, mp->imgbuf, n * s->param->line_size);
} }
block_size = n * s->param->line_size; block_size = n * s->param->line_size;
@ -725,7 +727,7 @@ const pixma_config_t pixma_mp730_devices[] = {
DEVICE ("Canon imageCLASS MF5730", "MF5730", MF5730_PID, 1200, 636, 868, PIXMA_CAP_ADF), DEVICE ("Canon imageCLASS MF5730", "MF5730", MF5730_PID, 1200, 636, 868, PIXMA_CAP_ADF),
DEVICE ("Canon imageCLASS MF5750", "MF5750", MF5750_PID, 1200, 636, 868, PIXMA_CAP_ADF), DEVICE ("Canon imageCLASS MF5750", "MF5750", MF5750_PID, 1200, 636, 868, PIXMA_CAP_ADF),
DEVICE ("Canon imageCLASS MF5770", "MF5770", MF5770_PID, 1200, 636, 868, PIXMA_CAP_ADF), DEVICE ("Canon imageCLASS MF5770", "MF5770", MF5770_PID, 1200, 636, 868, PIXMA_CAP_ADF),
DEVICE ("Canon imageCLASS MF3110", "MF3110", MF3110_PID, 600, 640, 877, 0), DEVICE ("Canon imageCLASS MF3110", "MF3110", MF3110_PID, 600, 636, 868, 0),
DEVICE (NULL, NULL, 0, 0, 0, 0, 0) DEVICE (NULL, NULL, 0, 0, 0, 0, 0)
}; };