From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Wed, 11 May 2016 15:25:56 +0000 (-0400)
Subject: Mirror fix from master.
X-Git-Tag: release-2.1.4~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f62664600159820a136a6e726a01a598b9ea292e;p=thirdparty%2Fcups.git

Mirror fix from master.
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 5c21e4fd66..68c50aacd6 100644
--- 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 4738258d39..0bdb855a77 100644
--- 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...