Wasn't using gcc for C++ compiler.

Wrong run levels for cups.sh.

Debug mode for RPMs.

Page headers for rasterview

Support all media and output type options in image RIP.

Drop some page device dictionary elements from gdevcups

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

diff --git a/cups.sh.in b/cups.sh.in
index 968fd1c6da84468b1c6b7f5f38164e7c85b71308..5c6a7e74591b59946129794f01db9e2790a0fda3 100755 (executable)
--- a/cups.sh.in
+++ b/cups.sh.in
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# "$Id: cups.sh.in,v 1.4 2000/07/10 19:19:12 mike Exp $"
+# "$Id: cups.sh.in,v 1.5 2000/09/09 22:43:58 mike Exp $"
 #
 #   Startup/shutdown script for the Common UNIX Printing System (CUPS).
 #
 #   Linux chkconfig stuff:
 #
-#   chkconfig: 02 99 00
+#   chkconfig: 0235 99 00
 #   description: Startup/shutdown script for the Common UNIX \
 #                Printing System (CUPS).
 #
@@ -110,5 +110,5 @@ exit 0
 
 
 #
-# End of "$Id: cups.sh.in,v 1.4 2000/07/10 19:19:12 mike Exp $".
+# End of "$Id: cups.sh.in,v 1.5 2000/09/09 22:43:58 mike Exp $".
 #

diff --git a/filter/imagetoraster.c b/filter/imagetoraster.c
index a8859111b04dbeba237935eb429b01042c260efe..7a082014783161a3452f7568cf8b86d58ffe07cf 100644 (file)
--- a/filter/imagetoraster.c
+++ b/filter/imagetoraster.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: imagetoraster.c,v 1.49 2000/08/01 16:06:00 mike Exp $"
+ * "$Id: imagetoraster.c,v 1.50 2000/09/09 22:43:58 mike Exp $"
  *
  *   Image file to raster filter for the Common UNIX Printing System (CUPS).
  *
@@ -746,6 +746,9 @@ main(int  argc,             /* I - Number of command-line arguments */
   header.Margins[0] = PageLeft;
   header.Margins[1] = PageBottom;
 
+  fprintf(stderr, "DEBUG: PageSize = [%d %d]\n", header.PageSize[0],
+          header.PageSize[1]);
+
   switch (Orientation)
   {
     case 0 :
@@ -1327,6 +1330,10 @@ exec_code(cups_page_header_t *header,    /* I - Page header */
     else if (strcmp(name, "cupsMediaPosition") == 0 || /* Compatibility */
              strcmp(name, "MediaPosition") == 0)
       header->MediaPosition = atoi(value);
+    else if (strcmp(name, "MediaClass") == 0)
+      strncpy(header->MediaClass, value, sizeof(header->MediaClass) - 1);
+    else if (strcmp(name, "MediaColor") == 0)
+      strncpy(header->MediaColor, value, sizeof(header->MediaColor) - 1);
     else if (strcmp(name, "MediaType") == 0)
       strncpy(header->MediaType, value, sizeof(header->MediaType) - 1);
     else if (strcmp(name, "OutputType") == 0)
@@ -4298,5 +4305,5 @@ make_lut(ib_t  *lut,              /* I - Lookup table */
 
 
 /*
- * End of "$Id: imagetoraster.c,v 1.49 2000/08/01 16:06:00 mike Exp $".
+ * End of "$Id: imagetoraster.c,v 1.50 2000/09/09 22:43:58 mike Exp $".
  */

diff --git a/pstoraster/gdevcups.c b/pstoraster/gdevcups.c
index 74bb5624bc2ddebb89e00b5df64a87849a317630..e520b209dbfd295e288bc2e4f53aceb79c65e4ce 100644 (file)
--- a/pstoraster/gdevcups.c
+++ b/pstoraster/gdevcups.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: gdevcups.c,v 1.32 2000/08/29 21:23:10 mike Exp $"
+ * "$Id: gdevcups.c,v 1.33 2000/09/09 22:44:01 mike Exp $"
  *
  *   GNU Ghostscript raster output driver for the Common UNIX Printing
  *   System (CUPS).
@@ -1540,12 +1540,8 @@ cups_put_params(gx_device     *pdev,     /* I - Device info */
   booloption(Separations, "Separations")
   booloption(TraySwitch, "TraySwitch")
   booloption(Tumble, "Tumble")
-  intoption(cupsWidth, "cupsWidth", unsigned)
-  intoption(cupsHeight, "cupsHeight", unsigned)
   intoption(cupsMediaType, "cupsMediaType", unsigned)
   intoption(cupsBitsPerColor, "cupsBitsPerColor", unsigned)
-  intoption(cupsBitsPerPixel, "cupsBitsPerPixel", unsigned)
-  intoption(cupsBytesPerLine, "cupsBytesPerLine", unsigned)
   intoption(cupsColorOrder, "cupsColorOrder", cups_order_t)
   intoption(cupsColorSpace, "cupsColorSpace", cups_cspace_t)
   intoption(cupsCompression, "cupsCompression", unsigned)
@@ -2709,5 +2705,5 @@ cups_print_planar(gx_device_printer *pdev,        /* I - Printer device */
 
 
 /*
- * End of "$Id: gdevcups.c,v 1.32 2000/08/29 21:23:10 mike Exp $".
+ * End of "$Id: gdevcups.c,v 1.33 2000/09/09 22:44:01 mike Exp $".
  */