Mirror fix from master.

diff --git a/CHANGES.txt b/CHANGES.txt
index 5c21e4fd66e7c4740eac07cdce67feb460b87d6e..68c50aacd6576ee21c7f70f7f0a1a3a953e1288b 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@ CHANGES.txt - 2.1.4 - 2016-05-11
 
 CHANGES IN CUPS V2.1.4
 
+       - Fixed printing of multiple files to raw queues (Issue #4782)
        - The scheduler did not implement the Hold-New-Jobs opertion correctly
          (Issue #4767)
        - The ipptool program truncated values at 8k (Issue #4786)

diff --git a/scheduler/job.c b/scheduler/job.c
index 4738258d392e2cc4781e143f0390f2d9dd9eccea..0bdb855a778a795489b1b7c96076c61720776c25 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -752,8 +752,8 @@ cupsdContinueJob(cupsd_job_t *job)  /* I - Job */
   * Add decompression/raw filter as needed...
   */
 
-  if (job->compressions[job->current_file] &&
-      (!job->printer->remote || job->num_files == 1))
+  if ((job->compressions[job->current_file] && (!job->printer->remote || job->num_files == 1)) ||
+      (!job->printer->remote && job->printer->raw && job->num_files > 1))
   {
    /*
     * Add gziptoany filter to the front of the list...