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

[stefan at ghostscript.com]

Author: stefan
Date: 2006-10-06 08:16:00 -0700 (Fri, 06 Oct 2006)
New Revision: 7089

Modified:
   trunk/gs/src/zdevice.c
Log:
Merge changes from pcl tree.

PSI_INCLUDED is used to signal that gs is not at the top of the system but
rather is part of a language switching build.

In this case the outputing of pages and management of the device is not 
completely under postscript's control.



Modified: trunk/gs/src/zdevice.c
===================================================================
--- trunk/gs/src/zdevice.c	2006-10-06 15:12:52 UTC (rev 7088)
+++ trunk/gs/src/zdevice.c	2006-10-06 15:16:00 UTC (rev 7089)
@@ -326,8 +326,13 @@
 
     check_type(op[-1], t_integer);
     check_type(*op, t_boolean);
+#ifdef PSI_INCLUDED
+    code = ps_end_page_top(imemory,
+			   (int)op[-1].value.intval, op->value.boolval);
+#else
     code = gs_output_page(igs, (int)op[-1].value.intval,
 			  op->value.boolval);
+#endif
     if (code < 0)
 	return code;
     pop(2);
@@ -430,7 +435,13 @@
         if(op->value.pdevice != dev) 	  /* don't allow a different device    */
 	    return_error(e_invalidaccess);
     }
+#ifndef PSI_INCLUDED
+    /* the language switching build shouldn't install a new device
+       here.  The language switching machinery installs a shared
+       device. */
+
     code = gs_setdevice_no_erase(igs, op->value.pdevice);
+#endif
     if (code < 0)
 	return code;
     make_bool(op, code != 0);	/* erase page if 1 */