slp/selphy_print
1
0
Fork 0
Code Issues 48 Pull requests Activity

dnp: Use the larger of the copy arguments available to us.

Browse source
This commit is contained in:
Solomon Peachy 2019-10-18 13:56:42 -04:00
parent 5bf9a2ef12
commit baae9b31f5
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
backend_dnpds40.c
View file

@ -1293,7 +1293,6 @@ static int dnpds40_read_parse(void *vctx, const void **vjob, int data_fd, int co
}
memset(job, 0, sizeof(*job));
job->printspeed = -1;
job->copies = copies;
/* There's no way to figure out the total job length in advance, we
have to parse the stream until we get to the image plane data,
@ -1384,8 +1383,8 @@ static int dnpds40_read_parse(void *vctx, const void **vjob, int data_fd, int co
/* Check for some offsets */
if(!memcmp("CNTRL QTY", job->databuf + job->datalen+2, 9)) {
/* Ignore this. We will insert our own later on */
// XXX use this instead of "copies" on cmdline?
memcpy(buf, job->databuf + job->datalen + 32, 8);
job->copies = atoi(buf);
continue;
}
if(!memcmp("CNTRL CUTTER", job->databuf + job->datalen+2, 12)) {
@ -1505,6 +1504,10 @@ parsed:
return CUPS_BACKEND_CANCEL;
}
/* Use the larger of the copy arguments */
if (copies > job->copies)
job->copies = copies;
/* Sanity check matte mode */
if (job->matte == 21 && !ctx->supports_finematte) {
WARNING("Printer FW does not support Fine Matte mode, downgrading to normal matte\n");