libcupsfilters, rastertopwg: Adjusted default output formats

If the output format is not supplied as parameter, ghostscript()
defaults to CUPS Raster now, as the ghostscript CUPS filter already
does.

rastertopwg does not support CUPS Raster output, so we changed the
CUPS filter rastertopwg to default to PWG Raster instead.

The rastertopwg() filter function errors out when NULL is supplied as
parameter. We let it also error out now if an unsupported output
format is supplied.

diff --git a/cupsfilters/ghostscript.c b/cupsfilters/ghostscript.c
index 7939ba631da690bed61207de2203afac6f5c0e07..4fe19b5a1138be25cafeafb27de982f25d332be3 100644 (file)
--- a/cupsfilters/ghostscript.c
+++ b/cupsfilters/ghostscript.c
@@ -745,9 +745,9 @@ ghostscript(int inputfd,         /* I - File descriptor input stream */
        outformat != OUTPUT_FORMAT_PWG_RASTER &&
        outformat != OUTPUT_FORMAT_APPLE_RASTER &&
        outformat != OUTPUT_FORMAT_PXL)
-      outformat = OUTPUT_FORMAT_PWG_RASTER;
+      outformat = OUTPUT_FORMAT_CUPS_RASTER;
   } else
-    outformat = OUTPUT_FORMAT_PWG_RASTER;
+    outformat = OUTPUT_FORMAT_CUPS_RASTER;
 
   if (log) log(ld, FILTER_LOGLEVEL_DEBUG,
               "ghostscript: Output format: %s",

diff --git a/cupsfilters/rastertopwg.c b/cupsfilters/rastertopwg.c
index 8d93a70315516b7ab009e67da09a1998298f36c9..d0d6861f3d239b523a505c165982e63aeba9c496 100644 (file)
--- a/cupsfilters/rastertopwg.c
+++ b/cupsfilters/rastertopwg.c
@@ -67,7 +67,14 @@ rastertopwg(int inputfd,         /* I - File descriptor input stream */
     output_format = *(filter_out_format_t *)parameters;
     if (output_format == OUTPUT_FORMAT_PWG_RASTER)
       outras = cupsRasterOpen(outputfd, CUPS_RASTER_WRITE_PWG);
-    else outras = cupsRasterOpen(outputfd, CUPS_RASTER_WRITE_APPLE);
+    if (output_format == OUTPUT_FORMAT_APPLE_RASTER)
+      outras = cupsRasterOpen(outputfd, CUPS_RASTER_WRITE_APPLE);
+    else
+    {
+      if (log) log(ld, FILTER_LOGLEVEL_ERROR,
+                  "rastertopwg: Invalid output format specified. Only PWG Raster and Apple Raster/URF are supported.");
+      return (1);
+    }
   }
   else
   {

diff --git a/filter/rastertopwg.c b/filter/rastertopwg.c
index 53420b11ec142f090977680f79b0f316283f6de9..1b8f6fad1c20e59e8c8a753029b1128d8885ce90 100644 (file)
--- a/filter/rastertopwg.c
+++ b/filter/rastertopwg.c
@@ -51,7 +51,7 @@ main(int  argc,          /* I - Number of command-line arguments */
  /*
   * Fire up the pdftoraster() filter function
   */
-  filter_out_format_t outformat = OUTPUT_FORMAT_CUPS_RASTER;
+  filter_out_format_t outformat = OUTPUT_FORMAT_PWG_RASTER;
   char *t = getenv("FINAL_CONTENT_TYPE");
   if (t) {
     if (strcasestr(t, "pwg"))
@@ -78,4 +78,4 @@ cancel_job(int sig)                   /* I - Signal number (unused) */
   (void)sig;
 
   JobCanceled = 1;
-}
\ No newline at end of file
+}