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

pixma_mp150: scan 48bit color and convert

merge-requests/244/head
Rolf Bensch 2020-07-06 23:04:59 +02:00
rodzic c4f0d4505e
commit b0efdd89cb
1 zmienionych plików z 17 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
backend/pixma/pixma_mp150.c
Wyświetl plik

@ -633,6 +633,12 @@ calc_raw_width (const mp150_t * mp, const pixma_scan_param_t * param)
return raw_width; return raw_width;
} }
static int
is_gray_16 (pixma_t * s)
{
return (s->param->mode == PIXMA_SCAN_MODE_GRAY_16);
}
static unsigned static unsigned
get_cis_line_size (pixma_t * s) get_cis_line_size (pixma_t * s)
{ {
@ -642,7 +648,9 @@ get_cis_line_size (pixma_t * s)
__func__, s->param->line_size, s->param->w, s->param->wx, mp->scale));*/ __func__, s->param->line_size, s->param->w, s->param->wx, mp->scale));*/
return (s->param->wx ? s->param->line_size / s->param->w * s->param->wx return (s->param->wx ? s->param->line_size / s->param->w * s->param->wx
: s->param->line_size) * mp->scale; : s->param->line_size)
* mp->scale
* (is_gray_16(s) ? 3 : 1);
} }
static int static int
@ -707,10 +715,12 @@ send_scan_param (pixma_t * s)
pixma_set_be32 (y, data + 0x10); pixma_set_be32 (y, data + 0x10);
pixma_set_be32 (wx, data + 0x14); pixma_set_be32 (wx, data + 0x14);
pixma_set_be32 (h, data + 0x18); pixma_set_be32 (h, data + 0x18);
data[0x1c] = (s->param->channels != 1) ? 0x08 : 0x04; /*PDBG (pixma_dbg (4, "*send_scan_param gen. 3+ ***** Setting: channels=%hi depth=%hi ***** \n",
s->param->channels, s->param->depth));*/
data[0x1c] = ((s->param->channels != 1) || (is_gray_16(s)) ? 0x08 : 0x04);
data[0x1d] = ((s->param->software_lineart) ? 8 : s->param->depth) data[0x1d] = ((s->param->software_lineart) ? 8 : s->param->depth)
* s->param->channels; /* bits per pixel */ * (is_gray_16(s) ? 3 : s->param->channels); /* bits per pixel */
data[0x1f] = 0x01; /* This one also seen at 0. Don't know yet what's used for */ data[0x1f] = 0x01; /* This one also seen at 0. Don't know yet what's used for */
data[0x20] = 0xff; data[0x20] = 0xff;
@ -1066,7 +1076,7 @@ post_process_image_data (pixma_t * s, pixma_imagebuf_t * ib)
} }
/* process image sizes */ /* process image sizes */
c = s->param->channels c = (is_gray_16(s) ? 3 : s->param->channels)
* ((s->param->software_lineart) ? 8 : s->param->depth) / 8; /* color channels count */ * ((s->param->software_lineart) ? 8 : s->param->depth) / 8; /* color channels count */
cw = c * s->param->w; /* image width */ cw = c * s->param->w; /* image width */
cx = c * s->param->xs; /* x-offset */ cx = c * s->param->xs; /* x-offset */
@ -1140,6 +1150,9 @@ post_process_image_data (pixma_t * s, pixma_imagebuf_t * ib)
/* Color / Gray to Lineart convert */ /* Color / Gray to Lineart convert */
if (s->param->software_lineart) if (s->param->software_lineart)
cptr = gptr = pixma_binarize_line (s->param, gptr, cptr, s->param->w, c); cptr = gptr = pixma_binarize_line (s->param, gptr, cptr, s->param->w, c);
/* Color to Grayscale convert for 16bit gray */
else if (is_gray_16(s))
cptr = gptr = pixma_rgb_to_gray (gptr, cptr, s->param->w, c);
else else
cptr += cw; cptr += cw;
} }