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

[leonardo at ghostscript.com]

Author: leonardo
Date: 2008-02-22 02:29:49 -0800 (Fri, 22 Feb 2008)
New Revision: 8538

Modified:
   trunk/gs/src/zfapi.c
Log:
Fix (FAPI) : Embedded fonts didn't work (continued).

DETAILS :

A condition for querying a glyph in GlyphDirectory was wrong.
Debugged with buttons.pdf from Karen.

EXPECTED DIFFERENCES :

None.


Modified: trunk/gs/src/zfapi.c
===================================================================
--- trunk/gs/src/zfapi.c	2008-02-22 10:09:30 UTC (rev 8537)
+++ trunk/gs/src/zfapi.c	2008-02-22 10:29:49 UTC (rev 8538)
@@ -562,16 +562,18 @@
 					ref *pdr, int char_code, const byte **ptr)
 {
     ref *GlyphDirectory, glyph0, *glyph = &glyph0, glyph_index;
-    if ((dict_find_string(pdr, "GlyphDirectory", &GlyphDirectory) > 0 &&
-         (r_type(GlyphDirectory) == t_dictionary &&
-          ( make_int(&glyph_index, char_code),
-            dict_find(GlyphDirectory, &glyph_index, &glyph) > 0))) ||
-        ((r_type(GlyphDirectory) == t_array &&
-          array_get(mem, GlyphDirectory, char_code, &glyph0) >= 0) &&
-         r_type(glyph) == t_string)) {
+    if (dict_find_string(pdr, "GlyphDirectory", &GlyphDirectory) > 0) {
+	if (((r_type(GlyphDirectory) == t_dictionary &&
+		(make_int(&glyph_index, char_code),
+		    dict_find(GlyphDirectory, &glyph_index, &glyph) > 0)) ||
+	     (r_type(GlyphDirectory) == t_array &&
+		array_get(mem, GlyphDirectory, char_code, &glyph0) >= 0)
+            )
+	    && r_type(glyph) == t_string) {
         *ptr = glyph->value.const_bytes;
 	return r_size(glyph);
     }
+    }
     return -1;
 }