Default to binary data for BeginData.

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

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 05309077868f234f611f28c7ad21ab9dc848b435..c2958aa248d831826b4330deffb6d6ea2f669b01 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,8 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.13
 
+       - The pstops filter did not default to Binary data for
+         "%%BeginData:".
        - The pstops filter did not stop processing when a line
          containing a CTRL-D is seen.
        - The scheduler no longer replaces the JobSheets values

diff --git a/filter/pstops.c b/filter/pstops.c
index c8d6ea51e4fe4423bce2f553e04e86d039d42523..ea49af4db60fd8dc1dc7104ae448f22eb6cf0432 100644 (file)
--- a/filter/pstops.c
+++ b/filter/pstops.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: pstops.c,v 1.54.2.4 2002/01/02 23:35:36 mike Exp $"
+ * "$Id: pstops.c,v 1.54.2.5 2002/01/03 16:19:53 mike Exp $"
  *
  *   PostScript filter for the Common UNIX Printing System (CUPS).
  *
@@ -351,7 +351,7 @@ main(int  argc,                     /* I - Number of command-line arguments */
         break;
       else if (strncmp(line, "%%BeginBinary:", 14) == 0 ||
                (strncmp(line, "%%BeginData:", 12) == 0 &&
-               strstr(line, "Binary") != NULL))
+               strstr(line, "ASCII") == NULL && strstr(line, "Hex") == NULL))
       {
        /*
         * Copy binary data...
@@ -1113,5 +1113,5 @@ start_nup(int number)     /* I - Page number */
 
 
 /*
- * End of "$Id: pstops.c,v 1.54.2.4 2002/01/02 23:35:36 mike Exp $".
+ * End of "$Id: pstops.c,v 1.54.2.5 2002/01/03 16:19:53 mike Exp $".
  */