More fixes for 6-color mode...

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@830 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cups/cups_C.h b/cups/cups_C.h
index ede3c9ab77b3c1bd7204dc389740733085b5c895..ec25b58b07bebb04e42e491c59b28ed86538098f 100644 (file)
--- a/cups/cups_C.h
+++ b/cups/cups_C.h
@@ -21,8 +21,8 @@
 "Copyright 1993-1999 by Easy Software Products, All Rights Reserved.",
 "General",
 "Printer",
-"Image Options",
-"HP-GL/2 Options",
+"Image",
+"HP-GL/2",
 "Extra",
 "Document",
 "Other",
@@ -82,7 +82,7 @@
 "Stopped",
 "All",
 "Odd",
-"Even Pages",
+"Even",
 "Darker                     Lighter",
 "Media Size",
 "Media Type",
@@ -99,6 +99,15 @@
 "Pending",
 "Output Mode",
 "Resolution",
+"Text",
+"Pretty Print",
+"Margins",
+"Left",
+"Right",
+"Bottom",
+"Top",
+"Filename(s)",
+"Print",
 "400 Your browser sent a request that this server could not understand.",
 "This server could not verify that you are authorized to access the resource.",
 "You must pay to access this server.",

diff --git a/pstoraster/gdevcups.c b/pstoraster/gdevcups.c
index 3e9e7b55df82a04f5d6ef97931c20fa7e613a7a6..d9f9d056ff982d03dde0b30fa3b068b6387546b6 100644 (file)
--- a/pstoraster/gdevcups.c
+++ b/pstoraster/gdevcups.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: gdevcups.c,v 1.18 1999/12/16 22:48:25 mike Exp $"
+ * "$Id: gdevcups.c,v 1.19 1999/12/16 23:13:15 mike Exp $"
  *
  *   GNU Ghostscript raster output driver for the Common UNIX Printing
  *   System (CUPS).
@@ -955,16 +955,16 @@ cups_print_pages(gx_device_printer *pdev, /* I - Device info */
     case CUPS_ORDER_BANDED :
         if (cups->header.cupsColorSpace == CUPS_CSPACE_KCMYcm &&
            cups->header.cupsBitsPerColor == 1)
-          cups->header.cupsBytesPerLine = (cups->header.cupsBitsPerPixel *
+          cups->header.cupsBytesPerLine = (cups->header.cupsBitsPerColor *
                                            cups->header.cupsWidth + 7) / 8 * 6;
         else
-          cups->header.cupsBytesPerLine = (cups->header.cupsBitsPerPixel *
+          cups->header.cupsBytesPerLine = (cups->header.cupsBitsPerColor *
                                            cups->header.cupsWidth + 7) / 8 *
                                          cups->color_info.num_components;
         break;
 
     case CUPS_ORDER_PLANAR :
-        cups->header.cupsBytesPerLine = (cups->header.cupsBitsPerPixel *
+        cups->header.cupsBytesPerLine = (cups->header.cupsBitsPerColor *
                                         cups->header.cupsWidth + 7) / 8;
         break;
   }
@@ -1597,7 +1597,7 @@ cups_print_banded(gx_device_printer *pdev,        /* I - Printer device */
   * to separate each chunked color as needed...
   */
 
-  bandbytes = cups->header.cupsBytesPerLine / pdev->color_info.num_components;
+  bandbytes = (cups->header.cupsWidth * cups->header.cupsBitsPerColor + 7) / 8;
 
   for (y = 0; y < cups->height; y ++)
   {
@@ -2349,5 +2349,5 @@ cups_print_planar(gx_device_printer *pdev,        /* I - Printer device */
 
 
 /*
- * End of "$Id: gdevcups.c,v 1.18 1999/12/16 22:48:25 mike Exp $".
+ * End of "$Id: gdevcups.c,v 1.19 1999/12/16 23:13:15 mike Exp $".
  */