Fix jobs with multiple files or multiple formats

Bug-Redhat: https://bugzilla.redhat.com/show_bug.cgi?id=972242
Bug: https://github.com/apple/cups/issues/4348
Patch-Name: fixes-for-jobs-with-multiple-files-and-multiple-formats.patch

Gbp-Pq: Name 0003-Fix-jobs-with-multiple-files-or-multiple-formats.patch
This commit is contained in:
Tim Waugh 2016-08-09 18:11:07 +02:00 committed by openKylinBot
parent 8dcd36bdbe
commit c538677bf8
1 changed files with 4 additions and 1 deletions

View File

@ -1804,7 +1804,10 @@ main(int argc, /* I - Number of command-line args */
ippAddBoolean(request, IPP_TAG_OPERATION, "last-document",
(i + 1) >= num_files);
if (document_format)
if (num_files > 1)
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
"document-format", NULL, "application/octet-stream");
else if (document_format)
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
"document-format", NULL, document_format);