[gs-cvs] rev 8775 - in trunk/gs: lib src

[alexcher at ghostscript.com]

Author: alexcher
Date: 2008-05-24 22:45:15 -0700 (Sat, 24 May 2008)
New Revision: 8775

Modified:
   trunk/gs/lib/pdf_font.ps
   trunk/gs/src/zfont.c
Log:
Revert the rev. 8509 because it is not needed after rev. 8774 but interferes
with FONTPATH search and memory font resources. Bug 689637.

DETAILS:
Since embedded PDF fints are now not registered as resources, there's no
need to distinguish between disk and memory font resources. Embedded fonts
bypass resource machinery; non-embedded fonts are loaded by name.
 
DIFFERENCES:
None.


Modified: trunk/gs/lib/pdf_font.ps
===================================================================
--- trunk/gs/lib/pdf_font.ps	2008-05-25 04:28:23 UTC (rev 8774)
+++ trunk/gs/lib/pdf_font.ps	2008-05-25 05:45:15 UTC (rev 8775)
@@ -601,17 +601,8 @@
 		% If the font isn't available, synthesize one based on
 		% its descriptor.
   dup /Font resourcestatus {
-    pop pop dup pdffindcachedfont
-    dup .isregisteredfont
-    % <font-resource> <fontname> <font> true	% font preloaded from disk
-    % <font-resource> <fontname> <font> false	% font preloaded from document
-    { exch pop false } { pop true } ifelse
+    pop pop pdffindcachedfont
   } {
-    true
-  } ifelse
-  % <font-resource> <font> false	% font preloaded from disk
-  % <font-resource> <fontname> true	% font not loaded yet or embedded
-  {
     1 index /FontDescriptor knownoget {
 		% Stack: font-res fontname fontdesc
       dup /Flags oget
@@ -683,7 +674,7 @@
 		% No descriptor available, use the default algorithm.
       pdffindcachedfont
     } ifelse
-  } if
+  } ifelse
   exch pop
 } bdef
 

Modified: trunk/gs/src/zfont.c
===================================================================
--- trunk/gs/src/zfont.c	2008-05-25 04:28:23 UTC (rev 8774)
+++ trunk/gs/src/zfont.c	2008-05-25 05:45:15 UTC (rev 8775)
@@ -208,21 +208,7 @@
     return 0;
 }
 
-/* <font> .isregisteredfont <bool> */
-static int
-zisregisteredfont(i_ctx_t *i_ctx_p)
-{
-    os_ptr op = osp;
-    gs_font *pfont;
-    int code = font_param(op, &pfont);
 
-    if (code < 0)
-	return code;
-    make_bool(op, pfont->is_resource);
-    return 0;
-}
-
-
 /* <Decoding> .setupUnicodeDecoder - */
 static int
 zsetupUnicodeDecoder(i_ctx_t *i_ctx_p)
@@ -251,7 +237,6 @@
     {"1setcacheparams", zsetcacheparams},
     {"0currentcacheparams", zcurrentcacheparams},
     {"1.registerfont", zregisterfont},
-    {"1.isregisteredfont", zisregisteredfont},
     {"1.setupUnicodeDecoder", zsetupUnicodeDecoder},
     op_def_end(zfont_init)
 };