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

[alexcher at ghostscript.com]

Author: alexcher
Date: 2007-04-08 11:45:58 -0700 (Sun, 08 Apr 2007)
New Revision: 7835

Modified:
   trunk/gs/lib/pdf_draw.ps
Log:
Make annotation handler more robust. Ignore annotations without /Subtype
entry and issue a warning.

DIFFERENCES:
No CET or Comparefiles differences. 


Modified: trunk/gs/lib/pdf_draw.ps
===================================================================
--- trunk/gs/lib/pdf_draw.ps	2007-04-08 18:23:38 UTC (rev 7834)
+++ trunk/gs/lib/pdf_draw.ps	2007-04-08 18:45:58 UTC (rev 7835)
@@ -1410,11 +1410,17 @@
 /drawannot {		% <annot> drawannot -
   dup annotvisible {
     gsave
-    dup dup /Subtype get //drawannottypes exch .knownget {
-      exec
+    dup dup /Subtype knownoget {
+      //drawannottypes exch .knownget {
+        exec
+      } {
+        dup calcstampscale exch drawwidget	% Use drawwidget for everything else
+      } ifelse			% type known
     } {
-      dup calcstampscale exch drawwidget	% Use drawwidget for everything else
-    } ifelse			% type known
+      pop
+      (   **** Warning: /Annot dict without required /Subtype entry is ignored.\n)
+      pdfformaterror
+    } ifelse
     grestore
   } if pop			% annotvisible
 } bdef