Use unified print-as-raster

Author: zdohnal

backend/ipp.c

@@ -1952,7 +1952,7 @@ main(int  argc,				/* I - Number of command-line args */
       * Need to reprocess the job as raster...
       */
 
-      fputs("JOBSTATE: force-raster\n", stderr);
+      fputs("JOBSTATE: cups-retry-as-raster\n", stderr);
       if (job_id > 0)
 	cancel_job(http, uri, job_id, resource, username, version);
 
@@ -2738,7 +2738,7 @@ monitor_printer(
               */
 
               job_canceled = 1;
-              fputs("JOBSTATE: force-raster\n", stderr);
+              fputs("JOBSTATE: cups-retry-as-raster\n", stderr);
 	    }
 	    else if (new_reasons & _CUPS_JSR_DOCUMENT_FORMAT_ERROR)
 	    {

cups/encode.c

@@ -136,7 +136,8 @@ static const _ipp_option_t ipp_options[] =
   { 0, "fit-to-page-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
   { 0, "fitplot",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
   { 0, "fitplot-default",	IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
-  { 0, "force-raster",		IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+  { 0, "print-as-raster",	IPP_TAG_BOOLEAN,	IPP_TAG_JOB },
+  { 0, "print-as-raster-default", IPP_TAG_BOOLEAN,	IPP_TAG_PRINTER },
   { 0, "gamma",			IPP_TAG_INTEGER,	IPP_TAG_JOB },
   { 0, "gamma-default",		IPP_TAG_INTEGER,	IPP_TAG_PRINTER },
   { 0, "hue",			IPP_TAG_INTEGER,	IPP_TAG_JOB },

scheduler/ipp.c

@@ -1517,8 +1517,8 @@ add_job(cupsd_client_t  *con,		/* I - Client connection */
     return (NULL);
   }
 
-  if (ippGetBoolean(ippFindAttribute(con->request, "force-raster", IPP_TAG_BOOLEAN), 0))
-    job->force_raster = 1;
+  if (ippGetBoolean(ippFindAttribute(con->request, "print-as-raster", IPP_TAG_BOOLEAN), 0))
+    job->print_as_raster = 1;
 
   job->dtype   = printer->type & (CUPS_PTYPE_CLASS | CUPS_PTYPE_REMOTE);
   job->attrs   = con->request;

scheduler/job.c

@@ -579,7 +579,7 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
 
     cupsRWLockWrite(&MimeDatabase->lock);
 
-    if (job->force_raster)
+    if (job->print_as_raster)
     {
      /*
       * Need to figure out whether the printer supports image/pwg-raster or
@@ -596,9 +596,9 @@ cupsdContinueJob(cupsd_job_t *job)	/* I - Job */
       }
 
       if (dst)
-        cupsdLogJob(job, CUPSD_LOG_DEBUG, "Forcing job as \"%s\".", strchr(dst->type, '/') + 1);
+	cupsdLogJob(job, CUPSD_LOG_DEBUG, "%s job as \"%s\".", job->print_as_raster > 0 ? "Printing" : "Retrying", strchr(dst->type, '/') + 1);
       else
-        cupsdLogJob(job, CUPSD_LOG_ERROR, "Unable to force job using a supported raster format.");
+	cupsdLogJob(job, CUPSD_LOG_ERROR, "Unable to force job using a supported raster format.");
     }
 
     filters = mimeFilter2(MimeDatabase, job->filetypes[job->current_file], (size_t)fileinfo.st_size, dst, &(job->cost));
@@ -5246,8 +5246,8 @@ update_job(cupsd_job_t *job)		/* I - Job to check */
 
       cupsdLogJob(job, CUPSD_LOG_DEBUG, "JOBSTATE: %s", message);
 
-      if (!strcmp(message, "force-raster"))
-        job->force_raster = 1;
+      if (!strcmp(message, "cups-retry-as-raster"))
+        job->print_as_raster = -1;
       else
         ippSetString(job->attrs, &job->reasons, 0, message);
     }

scheduler/job.h

@@ -76,7 +76,8 @@ struct cupsd_job_s			/**** Job request ****/
   int			status;		/* Status code from filters */
   int			tries;		/* Number of tries for this job */
   int			completed;	/* cups-waiting-for-job-completed seen */
-  int			force_raster;	/* Need to force the job as raster */
+  int			print_as_raster;
+					/* Need to print the job as raster */
   char			*auth_env[3],	/* AUTH_xxx environment variables,
                                          * if any */
 			*auth_uid;	/* AUTH_UID environment variable */