Update copyrights and license text on files that were missed.

[thirdparty/cups.git] / filter / rastertopwg.c

diff --git a/filter/rastertopwg.c b/filter/rastertopwg.c
index f478ac5807ac20d2ca4e5dab0e0d5308f67f3a84..1e63e4ec04f7058537003f6dbd86874821e26ea0 100644 (file)
--- a/filter/rastertopwg.c
+++ b/filter/rastertopwg.c
@@ -1,15 +1,10 @@
 /*
  * CUPS raster to PWG raster format filter for CUPS.
  *
- * Copyright 2011, 2014-2016 Apple Inc.
+ * Copyright © 2011, 2014-2017 Apple Inc.
  *
- * These coded instructions, statements, and computer programs are the
- * property of Apple Inc. and are protected by Federal copyright law.
- * Distribution and use rights are outlined in the file "LICENSE.txt"
- * which should have been included with this file.  If this file is
- * file is missing or damaged, see the license at "http://www.cups.org/".
- *
- * This file is subject to the Apple OS-Developed Software exception.
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  */
 
 /*
@@ -31,6 +26,8 @@ int                                   /* O - Exit status */
 main(int  argc,                                /* I - Number of command-line args */
      char *argv[])                     /* I - Command-line arguments */
 {
+  const char           *final_content_type;
+                                       /* FINAL_CONTENT_TYPE env var */
   int                  fd;             /* Raster file */
   cups_raster_t                *inras,         /* Input raster stream */
                        *outras;        /* Output raster stream */
@@ -48,7 +45,7 @@ main(int  argc,                               /* I - Number of command-line args */
                        lineoffset;     /* Offset into line */
   unsigned char                white;          /* White pixel */
   ppd_file_t           *ppd;           /* PPD file */
-  ppd_attr_t           *back;          /* cupsBackSize attribute */
+  ppd_attr_t           *back;          /* cupsBackSide attribute */
   _ppd_cache_t         *cache;         /* PPD cache */
   pwg_size_t           *pwg_size;      /* PWG media size */
   pwg_media_t          *pwg_media;     /* PWG media name */
@@ -73,8 +70,11 @@ main(int  argc,                              /* I - Number of command-line args */
   else
     fd = 0;
 
+  if ((final_content_type = getenv("FINAL_CONTENT_TYPE")) == NULL)
+    final_content_type = "image/pwg-raster";
+
   inras  = cupsRasterOpen(fd, CUPS_RASTER_READ);
-  outras = cupsRasterOpen(1, CUPS_RASTER_WRITE_PWG);
+  outras = cupsRasterOpen(1, !strcmp(final_content_type, "image/pwg-raster") ? CUPS_RASTER_WRITE_PWG : CUPS_RASTER_WRITE_APPLE);
 
   ppd   = ppdOpenFile(getenv("PPD"));
   back  = ppdFindAttr(ppd, "cupsBackSide", NULL);
@@ -430,6 +430,9 @@ main(int  argc,                             /* I - Number of command-line args */
     if (linesize < inheader.cupsBytesPerLine)
       linesize = inheader.cupsBytesPerLine;
 
+    if ((lineoffset + inheader.cupsBytesPerLine) > linesize)
+      lineoffset = linesize - inheader.cupsBytesPerLine;
+
     line = malloc(linesize);
 
     memset(line, white, linesize);