[gs-cvs] rev 7705 - in trunk/gs: doc src

[alexcher at ghostscript.com]

Author: alexcher
Date: 2007-02-16 05:25:42 -0800 (Fri, 16 Feb 2007)
New Revision: 7705

Modified:
   trunk/gs/doc/pscet_status.txt
   trunk/gs/src/zchar.c
Log:
Fix error reporting in CET 35_all-06. Add font type 32 to the check for CIDFont
resources, which was missing from the rev. 7574 patch. 

DIFFERENCES:
No test file differences, no other CET differences.


Modified: trunk/gs/doc/pscet_status.txt
===================================================================
--- trunk/gs/doc/pscet_status.txt	2007-02-16 07:44:07 UTC (rev 7704)
+++ trunk/gs/doc/pscet_status.txt	2007-02-16 13:25:42 UTC (rev 7705)
@@ -5496,7 +5496,11 @@
 
 35_all-5  OK	
 
-35_all-6  DIFF	Same as 34_all-5. Analyzed by Igor. assign: Alex.
+35_all-6  DIFF	Error reporting is fixed in rev. 7705.
+                There are still raster differences in the checkerboard
+                images at the bottom of the page. The images are resolution-dependent.
+                At 300 dpi some of them look darker than others. Adobe doesn't have
+                this problem. assign: Igor.
 
 35_all-7  AOK	Same as 33_all-7. Analyzed by Igor.
 

Modified: trunk/gs/src/zchar.c
===================================================================
--- trunk/gs/src/zchar.c	2007-02-16 07:44:07 UTC (rev 7704)
+++ trunk/gs/src/zchar.c	2007-02-16 13:25:42 UTC (rev 7705)
@@ -474,12 +474,10 @@
 	penum->outer_CID = osenum->returned.current_glyph;
     }
     if (osenum == NULL && !(penum->text.operation & (TEXT_FROM_GLYPHS | TEXT_FROM_SINGLE_GLYPH))) {
-	gs_font *pfont = igs->root_font;
-
-	if (pfont->FontType == ft_CID_encrypted || 
-	    pfont->FontType == ft_CID_user_defined ||
-	    pfont->FontType == ft_CID_TrueType)
-	    return_error(e_typecheck);
+        int ft = igs->root_font->FontType;
+ 
+        if (ft >= ft_CID_encrypted && ft <= ft_CID_TrueType || ft == ft_CID_bitmap)
+            return_error(e_typecheck);
     }
     make_mark_estack(ep - (snumpush - 1), es_show, op_show_cleanup);
     if (endproc == NULL)