Merge changes from CUPS 1.5svn-r8849.

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

diff --git a/filter/rastertohp.c b/filter/rastertohp.c
index 48b0cfcb1dd022bfe717b24502de9124648c8f3b..398a484e68e6fb3da8219634de68f961b3956008 100644 (file)
--- a/filter/rastertohp.c
+++ b/filter/rastertohp.c
@@ -1,10 +1,10 @@
 /*
- * "$Id: rastertohp.c 7403 2008-03-26 15:23:43Z mike $"
+ * "$Id: rastertohp.c 7834 2008-08-04 21:02:09Z mike $"
  *
  *   Hewlett-Packard Page Control Language filter for the Common UNIX
  *   Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2009 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -39,6 +39,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <errno.h>
 
 
 /*
@@ -183,6 +184,10 @@ StartPage(ppd_file_t         *ppd, /* I - PPD file */
           printf("\033&l80A");                 /* Set page size */
          break;
 
+      case 595 : /* A5 */
+          printf("\033&l25A");                 /* Set page size */
+         break;
+
       case 624 : /* DL Envelope */
           printf("\033&l90A");                 /* Set page size */
          break;
@@ -244,10 +249,9 @@ StartPage(ppd_file_t         *ppd, /* I - PPD file */
 
     if (!ppd || ppd->model_number != 2)
     {
-      if (header->Duplex)
-       printf("\033&l%dS",                     /* Set duplex mode */
-               header->Duplex + header->Tumble);
+      int mode = Duplex ? 1 + header->Tumble != 0 : 0;
 
+      printf("\033&l%dS", mode);               /* Set duplex mode */
       printf("\033&l0L");                      /* Turn off perforation skip */
     }
   }
@@ -365,7 +369,7 @@ StartPage(ppd_file_t         *ppd,  /* I - PPD file */
 
   if ((Planes[0] = malloc(header->cupsBytesPerLine)) == NULL)
   {
-    fputs("ERROR: Unable to allocate memory!\n", stderr);
+    fputs("ERROR: Unable to allocate memory\n", stderr);
     exit(1);
   }
 
@@ -705,8 +709,9 @@ main(int  argc,                             /* I - Number of command-line arguments */
     * and return.
     */
 
-    fprintf(stderr, _("Usage: %s job-id user title copies options [file]\n"),
-            argv[0]);
+    _cupsLangPrintf(stderr,
+                    _("Usage: %s job-id user title copies options [file]\n"),
+                    "rastertohp");
     return (1);
   }
 
@@ -718,7 +723,8 @@ main(int  argc,                             /* I - Number of command-line arguments */
   {
     if ((fd = open(argv[6], O_RDONLY)) == -1)
     {
-      perror("ERROR: Unable to open raster file - ");
+      _cupsLangPrintf(stderr, _("ERROR: Unable to open raster file - %s\n"),
+                      strerror(errno));
       sleep(1);
       return (1);
     }
@@ -794,8 +800,8 @@ main(int  argc,                             /* I - Number of command-line arguments */
        break;
 
       if ((y & 127) == 0)
-        fprintf(stderr, _("INFO: Printing page %d, %d%% complete...\n"), Page,
-               100 * y / header.cupsHeight);
+        _cupsLangPrintf(stderr, _("INFO: Printing page %d, %d%% complete...\n"),
+                        Page, 100 * y / header.cupsHeight);
 
      /*
       * Read a line of graphics...
@@ -847,14 +853,18 @@ main(int  argc,                           /* I - Number of command-line arguments */
   */
 
   if (Page == 0)
-    fputs(_("ERROR: No pages found!\n"), stderr);
+  {
+    _cupsLangPuts(stderr, _("ERROR: No pages found\n"));
+    return (1);
+  }
   else
-    fputs(_("INFO: Ready to print.\n"), stderr);
-
-  return (Page == 0);
+  {
+    _cupsLangPuts(stderr, _("INFO: Ready to print.\n"));
+    return (0);
+  }
 }
 
 
 /*
- * End of "$Id: rastertohp.c 7403 2008-03-26 15:23:43Z mike $".
+ * End of "$Id: rastertohp.c 7834 2008-08-04 21:02:09Z mike $".
  */