[gs-cvs] rev 7168 - trunk/gs/lib

[alexcher at ghostscript.com]

Author: alexcher
Date: 2006-11-06 19:50:09 -0800 (Mon, 06 Nov 2006)
New Revision: 7168

Modified:
   trunk/gs/lib/gs_dps2.ps
   trunk/gs/lib/gs_ll3.ps
Log:
Adjust error reporting from sethalftone to match CET 09-40.
Fix an error in sethalftone redefinition. Halftone can read from
the current file; sethalftone cannot be redefined as { pop } .

DIFFERENCES:
None


Modified: trunk/gs/lib/gs_dps2.ps
===================================================================
--- trunk/gs/lib/gs_dps2.ps	2006-11-07 01:13:42 UTC (rev 7167)
+++ trunk/gs/lib/gs_dps2.ps	2006-11-07 03:50:09 UTC (rev 7168)
@@ -120,7 +120,14 @@
 	% We must create the new dictionary in the same VM as the
 	% operand; otherwise, invalidaccess errors may occur.
   .currentglobal 1 .argindex dup gcheck .setglobal
-  dup //.halftonetypes 1 index /HalftoneType get get exec exec
+  dup //.halftonetypes 1 index /HalftoneType get
+  dup type /integertype ne {
+    /sethalftone .systemvar /typecheck signalerror
+  } if
+  .knownget not {
+    /sethalftone .systemvar /rangecheck signalerror
+  } if
+  exec exec
   .setglobal pop
 } odef
 % Redefine setscreen and setcolorscreen to recognize halftone dictionaries,

Modified: trunk/gs/lib/gs_ll3.ps
===================================================================
--- trunk/gs/lib/gs_ll3.ps	2006-11-07 01:13:42 UTC (rev 7167)
+++ trunk/gs/lib/gs_ll3.ps	2006-11-07 03:50:09 UTC (rev 7168)
@@ -190,7 +190,8 @@
   /HalftoneMode getuserparam 0 eq {
     //sethalftone
   } {
-    pop .getdefaulthalftone
+    gsave //sethalftone grestore
+    .getdefaulthalftone
     { //sethalftone }
     { .setdefaulthalftone }
     ifelse