Mirror 1.1.x changes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3835 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c
index 92b066bbc3f974cb447ed863e5ca359e8b98258a..4071ec56a4ec1c4a30ac2d5f5a2dbce2b53385c8 100644 (file)
--- a/cgi-bin/ipp-var.c
+++ b/cgi-bin/ipp-var.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ipp-var.c,v 1.23.2.12 2003/07/20 03:49:45 mike Exp $"
+ * "$Id: ipp-var.c,v 1.23.2.13 2003/07/25 20:39:35 mike Exp $"
  *
  *   IPP variable routines for the Common UNIX Printing System (CUPS).
  *
@@ -150,7 +150,7 @@ ippGetAttributes(ipp_t      *request,       /* I - IPP request */
   if (num_attrs > 0)
   {
     ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
-                  "requested-attributes", num_attrs, NULL, attrs);
+                  "requested-attributes", num_attrs, NULL, (const char **)attrs);
 
     for (i = 0; i < num_attrs; i ++)
       free(attrs[i]);
@@ -506,5 +506,5 @@ ippSetCGIVars(ipp_t      *response, /* I - Response data to be copied... */
 
 
 /*
- * End of "$Id: ipp-var.c,v 1.23.2.12 2003/07/20 03:49:45 mike Exp $".
+ * End of "$Id: ipp-var.c,v 1.23.2.13 2003/07/25 20:39:35 mike Exp $".
  */

diff --git a/filter/.cvsignore b/filter/.cvsignore
index 9eabf3d5d4eeb83073140ad91b29237be5afa87f..1cf4b27e7492401e0afc24a8cc4d34117bd7615b 100644 (file)
--- a/filter/.cvsignore
+++ b/filter/.cvsignore
@@ -2,8 +2,9 @@ gziptoany
 hpgltops
 imagetops
 imagetoraster
+libcupsimage.2.dylib
 libcupsimage.a
-libcupsimage.dylib.2
+libcupsimage.dylib
 libcupsimage.sl.2
 libcupsimage.so.2
 libcupsimage_s.a

diff --git a/filter/pstops.c b/filter/pstops.c
index 2eb4374fab8887908e1defbfd805770efab84d66..45172127b4c613cb1c26215d413f3ea61b39fda2 100644 (file)
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: pstops.c,v 1.54.2.40 2003/07/20 02:07:45 mike Exp $"
+ * "$Id: pstops.c,v 1.54.2.41 2003/07/25 20:39:36 mike Exp $"
  *
  *   PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -244,9 +244,9 @@ main(int  argc,                     /* I - Number of command-line arguments */
 
   if ((val = cupsGetOption("page-border", num_options, options)) != NULL)
   {
-    if (strcasecmp(val, "none"))
+    if (!strcasecmp(val, "none"))
       Border = BORDER_NONE;
-    else if (strcasecmp(val, "single"))
+    else if (!strcasecmp(val, "single"))
       Border = BORDER_SINGLE;
     else if (!strcasecmp(val, "single-thick"))
       Border = BORDER_SINGLE2;
@@ -1886,5 +1886,5 @@ start_nup(int number,                     /* I - Page number */
 
 
 /*
- * End of "$Id: pstops.c,v 1.54.2.40 2003/07/20 02:07:45 mike Exp $".
+ * End of "$Id: pstops.c,v 1.54.2.41 2003/07/25 20:39:36 mike Exp $".
  */