[gs-cvs] rev 7178 - trunk/gs/src

[alexcher at ghostscript.com]

Author: alexcher
Date: 2006-11-08 08:13:35 -0800 (Wed, 08 Nov 2006)
New Revision: 7178

Modified:
   trunk/gs/src/idparam.c
Log:
Make UniqueID error reporting match Adobe's. Partial fix for 13-05.PS.


Modified: trunk/gs/src/idparam.c
===================================================================
--- trunk/gs/src/idparam.c	2006-11-08 13:36:18 UTC (rev 7177)
+++ trunk/gs/src/idparam.c	2006-11-08 16:13:35 UTC (rev 7178)
@@ -376,11 +376,10 @@
 	uid_set_invalid(puid);
 	return defaultval;
     } else {
-	if (!r_has_type(puniqueid, t_integer) ||
-	    puniqueid->value.intval < 0 ||
-	    puniqueid->value.intval > 0xffffffL
-	    )
-	    return_error(e_rangecheck);
+	if (!r_has_type(puniqueid, t_integer))
+	   return_error(e_typecheck);
+ 	if (puniqueid->value.intval < 0 || puniqueid->value.intval > 0xffffffL)
+	   return_error(e_rangecheck);
 	/* Apparently fonts created by Fontographer often have */
 	/* a UniqueID of 0, contrary to Adobe's specifications. */
 	/* Treat 0 as equivalent to -1 (no UniqueID). */