Merge the gs853merge branch down into the trunk. This ports ghostpcl and

ghostxps to build against a branch of ghostscript close it its current
mainline (around r7000) between Ghostscript 8.54 and 8.55.

This mostly consists of removing the memory pointers from many calls as
well as a few other api changes, as well as some makefile updates, which
were skewed between the branches.

Nevertheless this is a big merge and there are likely to be a few
mistakes. The previous trunk is tagged as /tags/ghostpcl-pre855merge
for comparision.

Both pcl6 and pspcl6 build and run with the Artifex font scaler (the
native gs one). pcl6 compiles but does not link with ufst. pspcl6 does
not compile with ufst, but that's not too different from what was
happening in the branch. Fixing this will of course come next.

git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@2566 06663e23-700e-0410-b217-a244a6096597

1 files changed, 7 insertions, 9 deletions

diff --git a/pcl/pctop.c b/pcl/pctop.c
index c6d26663a..17a188d04 100644
--- a/pcl/pctop.c
+++ b/pcl/pctop.c
@@ -498,7 +498,7 @@ pcl_impl_report_errors(
 	uint count;
 
 	while ( (count = pcl_status_read(buf, sizeof(buf), &pcli->pcs)) != 0 )
-	  errwrite(pcli->memory, buf, count);
+	  errwrite(buf, count);
 
 	return 0;
 }
@@ -525,19 +525,17 @@ pcl_impl_remove_device(
 	/* return to the original graphic state w/color mapper, bbox, target */
 	code = pcl_grestore(&pcli->pcs);
 	if (code < 0 )
-	    dprintf1(pcli->memory, 
-		     "error code %d restoring gstate, continuing\n", code );
+	    dprintf1("error code %d restoring gstate, continuing\n", code );
 	/* return to original gstate w/bbox, target */
 	code = gs_grestore_only(pcli->pcs.pgs);	/* destroys gs_save stack */
 	if (code < 0 )
-	    dprintf1(pcli->memory, 
-		     "error code %d destroying gstate, continuing\n", code );
+	    dprintf1("error code %d destroying gstate, continuing\n", code );
 
 	/* Deselect bbox. Bbox has been prevented from auto-closing/deleting */
 	code = gs_nulldevice(pcli->pcs.pgs);
 	if ( code < 0 )
-	    dprintf1(pcli->memory, 
-		     "error code %d installing nulldevice, continuing\n", code );
+	    dprintf1("error code %d installing nulldevice, continuing\n", code );
+	//return pcl_do_resets(&pcli->pcs, pcl_reset_printer);
 	return pcl_do_resets(&pcli->pcs, pcl_reset_permanent);
 }
 
@@ -551,7 +549,7 @@ pcl_impl_deallocate_interp_instance(
 	gs_memory_t *mem = pcli->memory;
         /* free memory used by the parsers */
         if ( pcl_parser_shutdown(&pcli->pst, mem ) < 0 ) {
-            dprintf(mem, "Undefined error shutting down parser, continuing\n" );
+            dprintf("Undefined error shutting down parser, continuing\n" );
         }
         /* this should have a shutdown procedure like pcl above */
         gs_free_object(mem, 
@@ -563,7 +561,7 @@ pcl_impl_deallocate_interp_instance(
 
 	/* free halftone cache in gs state */
         // NB	gs_free_ht_cache(mem, pcli->pcs.pgs);
-        gs_state_free_view_clip(pcli->pcs.pgs);
+        // NB might not be needed in 8.53 // gs_state_free_view_clip(pcli->pcs.pgs);
 	gs_state_free(pcli->pcs.pgs);
 	/* remove pcl's gsave grestore stack */
 	pcl_free_gstate_stk(&pcli->pcs);