libcupsfilters: Added Apple Raster output to pclmtoraster()

The pclmtoraster() filter function outputs CUPS Raster and PWG Raster
using the Raster output functions of libcups. So it is trivial to add
Apple Raster using the appropriate mode in cupsRasterOpen(). We are
doing this now and by a parameter we can select the output format, as
with most other filter functions.

Before, the switching between CUPS Raster and PWG Raster was only
possible via the FINAL_CONTENT_TYPE environment variable which works
for a CUPS filter but not generally for a filter function.

Also switched to use cupsRasterPrepareHeader() instead of
ppdRasterInterpretPPD()/cupsRasterParseIPPOptions().

diff --git a/cupsfilters/filter.h b/cupsfilters/filter.h
index e8597b0ca96602f2dd3e92c2c7e0564d72364c45..59cc6ea0ecb98616704b5772ac5a555e909ff82f 100644 (file)
--- a/cupsfilters/filter.h
+++ b/cupsfilters/filter.h
@@ -275,6 +275,9 @@ extern int pclmtoraster(int inputfd,
                        filter_data_t *data,
                        void *parameters);
 
+/* Parameters: filter_out_format_t*
+   Ouput format: CUPS Raster, Apple Raster, or PWG Raster */
+
 
 extern int pdftopdf(int inputfd,
                    int outputfd,

diff --git a/cupsfilters/pclmtoraster.cxx b/cupsfilters/pclmtoraster.cxx
index ad79ad010aa1d3f69fbbe60f416a79a446ec4c7f..55ffe36ee0348b4fd8a7dea4d80b3a6faf842e12 100644 (file)
--- a/cupsfilters/pclmtoraster.cxx
+++ b/cupsfilters/pclmtoraster.cxx
@@ -41,7 +41,7 @@
 
 typedef struct pclmtoraster_data_s
 {
-  int pwgraster = 0;
+  filter_out_format_t outformat = OUTPUT_FORMAT_PWG_RASTER;
   int numcolors = 0;
   int rowsize = 0;
   cups_page_header2_t header;
@@ -79,7 +79,7 @@ typedef struct conversion_function_s
 } conversion_function_t;
 
 static int
-parseOpts(filter_data_t *data,
+parseOpts(filter_data_t *data, filter_out_format_t outformat,
          pclmtoraster_data_t *pclmtoraster_data)
 {
   int                  num_options = 0;
@@ -91,27 +91,51 @@ parseOpts(filter_data_t *data,
   void                 *ld = data->logdata;
   ppd_file_t           *ppd = pclmtoraster_data->ppd;
   cups_page_header2_t  *header = &(pclmtoraster_data->header);
-  ipp_t *printer_attrs = data->printer_attrs;
-#ifdef HAVE_CUPS_1_7
-  t = getenv("FINAL_CONTENT_TYPE");
-  if (t && strcasestr(t, "pwg"))
-    pclmtoraster_data->pwgraster = 1;
-#endif /* HAVE_CUPS_1_7 */
+  ipp_t                 *printer_attrs = data->printer_attrs;
+  cups_cspace_t         cspace = (cups_cspace_t)(-1);
+
+
+  pclmtoraster_data->outformat = outformat;
+
  /*
   * CUPS option list
   */
 
   num_options = joinJobOptionsAndAttrs(data, num_options, &options);
 
-  ppd = data->ppd;
+  if (data->ppd)
+    ppd = data->ppd;
+  else if (data->ppdfile)
+    ppd = data->ppd = ppdOpenFile(data->ppdfile);
+
+  if (ppd)
+  {
+    ppdMarkOptions(ppd, num_options, options);
+    if ((attr = ppdFindAttr(ppd,"PWGRaster",0)) != 0 &&
+        (!strcasecmp(attr->value, "true")
+         || !strcasecmp(attr->value, "on") ||
+         !strcasecmp(attr->value, "yes")))
+      pclmtoraster_data->outformat = OUTPUT_FORMAT_PWG_RASTER;
+  }
+  else
+  {
+    if (log) log(ld, FILTER_LOGLEVEL_DEBUG,
+                "pclmtoraster: PPD file is not specified.");
+
+    t = cupsGetOption("media-class", num_options, options);
+    if (t == NULL)
+      t = cupsGetOption("MediaClass", num_options, options);
+    if (t != NULL)
+    {
+      if (strcasestr(t, "pwg"))
+       pclmtoraster_data->outformat = OUTPUT_FORMAT_PWG_RASTER;
+    }
+  }
 
-  if (ppd == NULL && log)
-      log(ld, FILTER_LOGLEVEL_DEBUG,
-         "pclmtoraster: PPD file is not specified.");
+  cupsRasterPrepareHeader(header, data, outformat, outformat, 0, &cspace);
 
   if (ppd)
   {
-    ppdRasterInterpretPPD(header, ppd, num_options, options, 0);
     if (header->Duplex)
     {
       /* analyze options relevant to Duplex */
@@ -185,30 +209,7 @@ parseOpts(filter_data_t *data,
         }
       }
     }
-
-#ifdef HAVE_CUPS_1_7
-    if ((attr = ppdFindAttr(ppd,"PWGRaster",0)) != 0 &&
-        (!strcasecmp(attr->value, "true")
-         || !strcasecmp(attr->value, "on") ||
-         !strcasecmp(attr->value, "yes")))
-      pclmtoraster_data->pwgraster = 1;
-#endif /* HAVE_CUPS_1_7 */
   } else {
-#ifdef HAVE_CUPS_1_7
-    pclmtoraster_data->pwgraster = 1;
-    t = cupsGetOption("media-class", num_options, options);
-    if (t == NULL)
-      t = cupsGetOption("MediaClass", num_options, options);
-    if (t != NULL)
-    {
-      if (strcasestr(t, "pwg"))
-        pclmtoraster_data->pwgraster = 1;
-      else
-        pclmtoraster_data->pwgraster = 0;
-    }
-    cupsRasterParseIPPOptions(header, data,
-                             pclmtoraster_data->pwgraster, 1);
-
     int backside = getBackSideAndHeaderDuplex(printer_attrs, header);
     if(header->Duplex){
       /* analyze options relevant to Duplex */
@@ -257,14 +258,7 @@ parseOpts(filter_data_t *data,
            !(pclmtoraster_data->swap_margin_y);
         }
       }
-
     }
-    
-#else
-    if (log) log(ld, FILTER_LOGLEVEL_ERROR,
-               "pclmtoraster: No PPD file specified: %s", strerror(errno));
-    return (1);
-#endif /* HAVE_CUPS_1_7 */
   }
   if ((val = cupsGetOption("print-color-mode", num_options, options)) != NULL
                            && !strncasecmp(val, "bi-level", 8))
@@ -896,13 +890,13 @@ outPage(cups_raster_t*     raster,        /* I - Raster stream */
   {
     ppdRasterMatchPPDSize(&(data->header), ppd, margins, paperdimensions, NULL,
                          NULL);
-    if (data->pwgraster == 1)
+    if (data->outformat != OUTPUT_FORMAT_CUPS_RASTER)
       memset(margins, 0, sizeof(margins));
   }
   else if(filter_data!=NULL &&(filter_data->printer_attrs)!=NULL)
   {
     ippRasterMatchIPPSize(&(data->header), filter_data, margins, paperdimensions, NULL, NULL);
-    if(data->pwgraster==1)
+    if (data->outformat != OUTPUT_FORMAT_CUPS_RASTER)
       memset(margins, 0, sizeof(margins));
   }
   else
@@ -912,7 +906,7 @@ outPage(cups_raster_t*       raster,        /* I - Raster stream */
     if (data->header.cupsImagingBBox[3] > 0.0)
     {
       /* Set margins if we have a bounding box defined ... */
-      if (data->pwgraster == 0)
+      if (data->outformat == OUTPUT_FORMAT_CUPS_RASTER)
       {
        margins[0] = data->header.cupsImagingBBox[0];
        margins[1] = data->header.cupsImagingBBox[1];
@@ -946,12 +940,12 @@ outPage(cups_raster_t*     raster,        /* I - Raster stream */
     data->header.cupsPageSize[i] = paperdimensions[i];
     data->header.PageSize[i] = (unsigned int)(data->header.cupsPageSize[i] +
                                              0.5);
-    if (data->pwgraster == 0)
+    if (data->outformat == OUTPUT_FORMAT_CUPS_RASTER)
       data->header.Margins[i] = margins[i] + 0.5;
     else
       data->header.Margins[i] = 0;
   }
-  if (data->pwgraster == 0)
+  if (data->outformat == OUTPUT_FORMAT_CUPS_RASTER)
   {
     data->header.cupsImagingBBox[0] = margins[0];
     data->header.cupsImagingBBox[1] = margins[1];
@@ -1108,6 +1102,7 @@ pclmtoraster(int inputfd,         /* I - File descriptor input stream */
             filter_data_t *data, /* I - Job and printer data */
             void *parameters)    /* I - Filter-specific parameters (unused) */
 {
+  filter_out_format_t   outformat;
   FILE                 *inputfp;               /* Input file pointer */
   int                  fd = 0;                 /* Copy file descriptor */
   char                 *filename,              /* PDF file to convert */
@@ -1124,6 +1119,21 @@ pclmtoraster(int inputfd,         /* I - File descriptor input stream */
   filter_iscanceledfunc_t iscanceled = data->iscanceledfunc;
   void                  *icd = data->iscanceleddata;
 
+  if (parameters) {
+    outformat = *(filter_out_format_t *)parameters;
+    if (outformat != OUTPUT_FORMAT_CUPS_RASTER &&
+       outformat != OUTPUT_FORMAT_PWG_RASTER &&
+       outformat != OUTPUT_FORMAT_APPLE_RASTER)
+      outformat = OUTPUT_FORMAT_PWG_RASTER;
+  } else
+    outformat = OUTPUT_FORMAT_PWG_RASTER;
+
+  if (log) log(ld, FILTER_LOGLEVEL_DEBUG,
+              "pclmtoraster: Output format: %s",
+              (outformat == OUTPUT_FORMAT_CUPS_RASTER ? "CUPS Raster" :
+               (outformat == OUTPUT_FORMAT_PWG_RASTER ? "PWG Raster" :
+                "Apple Raster")));
+
  /*
   * Open the input data stream specified by the inputfd...
   */
@@ -1161,7 +1171,7 @@ pclmtoraster(int inputfd,         /* I - File descriptor input stream */
   filename = tempfile;
   pdf->processFile(filename);
 
-  if (parseOpts(data, &pclmtoraster_data) != 0)
+  if (parseOpts(data, outformat, &pclmtoraster_data) != 0)
   {
     delete(pdf);
     unlink(tempfile);
@@ -1199,9 +1209,14 @@ pclmtoraster(int inputfd,         /* I - File descriptor input stream */
     pclmtoraster_data.nbands = 1;
   }
 
-  if ((raster = cupsRasterOpen(outputfd, pclmtoraster_data.pwgraster ?
-                              CUPS_RASTER_WRITE_PWG :
-                               CUPS_RASTER_WRITE)) == 0)
+  if ((raster = cupsRasterOpen(outputfd,
+                              (pclmtoraster_data.outformat ==
+                                 OUTPUT_FORMAT_CUPS_RASTER ?
+                                 CUPS_RASTER_WRITE :
+                               (pclmtoraster_data.outformat ==
+                                  OUTPUT_FORMAT_PWG_RASTER ?
+                                  CUPS_RASTER_WRITE_PWG :
+                                CUPS_RASTER_WRITE_APPLE)))) == 0)
   {
     if(log) log(ld, FILTER_LOGLEVEL_ERROR,
                "pclmtoraster: Can't open raster stream: %s",

diff --git a/filter/pclmtoraster.c b/filter/pclmtoraster.c
index 4f0182d9197733beddfc90bbb8404402f75fc0ab..25cf24ff2b881a48bd159bd505183157c55f96c6 100644 (file)
--- a/filter/pclmtoraster.c
+++ b/filter/pclmtoraster.c
@@ -37,7 +37,16 @@ int main(int argc, char **argv)
   * Fire up the pclmtoraster() filter function
   */
 
-  ret = filterCUPSWrapper(argc, argv, pclmtoraster, NULL, &JobCanceled);
+  filter_out_format_t outformat = OUTPUT_FORMAT_PWG_RASTER;
+  char *t = getenv("FINAL_CONTENT_TYPE");
+  if (t) {
+    if (strcasestr(t, "urf"))
+      outformat = OUTPUT_FORMAT_APPLE_RASTER;
+    else if (strcasestr(t, "cups-raster"))
+      outformat = OUTPUT_FORMAT_CUPS_RASTER;
+  }
+
+  ret = filterCUPSWrapper(argc, argv, pclmtoraster, &outformat, &JobCanceled);
 
   if (ret)
     fprintf(stderr, "ERROR: pclmtoraster filter function failed.\n");