[gs-cvs] rev 8786 - trunk/gs/src

[alexcher at ghostscript.com]

Author: alexcher
Date: 2008-05-30 13:25:17 -0700 (Fri, 30 May 2008)
New Revision: 8786

Modified:
   trunk/gs/src/iscan.c
Log:
Dom't interpret ^D (0x04) as a self-delimeted character in PDF mode because
PDF doesn't need this hack. Bug 689875.

DIFFERENCES:
None


Modified: trunk/gs/src/iscan.c
===================================================================
--- trunk/gs/src/iscan.c	2008-05-28 21:52:03 UTC (rev 8785)
+++ trunk/gs/src/iscan.c	2008-05-30 20:25:17 UTC (rev 8786)
@@ -470,12 +470,6 @@
   else ref_stack_pop(&o_stack, 1)
     int max_name_ctype =
 	(recognize_btokens()? ctype_name : ctype_btoken);
-    /*
-     * The following is a hack so that ^D will be self-delimiting in files
-     * (to compensate for bugs in some PostScript-generating applications)
-     * but not in strings (to match CPSI on the CET).
-     */
-    int ctrld = (pstate->s_options & SCAN_FROM_STRING ? 0x04 : 0xffff);
 
 #define scan_sign(sign, ptr)\
   switch ( *ptr ) {\
@@ -495,6 +489,13 @@
     int sign;
     const bool check_only = (pstate->s_options & SCAN_CHECK_ONLY) != 0;
     const bool PDFScanRules = (i_ctx_p->scanner_options & SCAN_PDF_RULES) != 0;
+    /*
+     * The following is a hack so that ^D will be self-delimiting in PS files
+     * (to compensate for bugs in some PostScript-generating applications)
+     * but not in strings (to match CPSI on the CET) or PDF.
+     */
+    const int ctrld = (pstate->s_options & SCAN_FROM_STRING ||
+                      PDFScanRules ? 0x04 : 0xffff);
     scanner_state sstate;
 
 #define pstack sstate.s_pstack