[gs-cvs] rev 7160 - in trunk/gs: lib src

[alexcher at ghostscript.com]

Author: alexcher
Date: 2006-11-04 06:11:05 -0800 (Sat, 04 Nov 2006)
New Revision: 7160

Modified:
   trunk/gs/lib/gs_lev2.ps
   trunk/gs/src/gsfont.c
   trunk/gs/src/zusparam.c
Log:
Accept negative value for MinFontCompress user parameter and silently
substitute with 0. Intercept setuserparams errors and re-throw them as
setcacheparams errors. Partial fix for CET 27-07.ps.

DIFFERENCES:
None


Modified: trunk/gs/lib/gs_lev2.ps
===================================================================
--- trunk/gs/lib/gs_lev2.ps	2006-11-04 05:59:16 UTC (rev 7159)
+++ trunk/gs/lib/gs_lev2.ps	2006-11-04 14:11:05 UTC (rev 7160)
@@ -250,8 +250,9 @@
     3 -1 roll pop
     /MinFontCompress 3 1 roll
     /MaxFontItem exch
-  .dicttomark setuserparams
-  cleartomark
+  .dicttomark { setuserparams cleartomark } stopped {
+    /setcacheparams .systemvar $error /errorname get signalerror
+  } if
 } .bind odef
 
 % Add bogus user and system parameters to satisfy badly written PostScript

Modified: trunk/gs/src/gsfont.c
===================================================================
--- trunk/gs/src/gsfont.c	2006-11-04 05:59:16 UTC (rev 7159)
+++ trunk/gs/src/gsfont.c	2006-11-04 14:11:05 UTC (rev 7160)
@@ -637,7 +637,7 @@
 int
 gs_setcachelower(gs_font_dir * pdir, uint size)
 {
-    pdir->ccache.lower = size;
+    pdir->ccache.lower = ((int)size < 0) ? 0 : size; /* ?: for CET 27-07 */;
     return 0;
 }
 int

Modified: trunk/gs/src/zusparam.c
===================================================================
--- trunk/gs/src/zusparam.c	2006-11-04 05:59:16 UTC (rev 7159)
+++ trunk/gs/src/zusparam.c	2006-11-04 14:11:05 UTC (rev 7160)
@@ -438,7 +438,7 @@
      current_JobTimeout, set_JobTimeout},
     {"MaxFontItem", MIN_INT_PARAM, MAX_UINT_PARAM,
      current_MaxFontItem, set_MaxFontItem},
-    {"MinFontCompress", 0, MAX_UINT_PARAM,
+    {"MinFontCompress", MIN_INT_PARAM, MAX_UINT_PARAM,
      current_MinFontCompress, set_MinFontCompress},
     {"MaxOpStack", 0, MAX_UINT_PARAM,
      current_MaxOpStack, set_MaxOpStack},