[gs-cvs] gs/src

Igor Melichev igor at casper.ghostscript.com
Tue Jul 9 07:55:05 PDT 2002


Update of /cvs/ghostscript/gs/src
In directory casper:/tmp/cvs-serv21802/gs/src

Modified Files:
	zfapi.c ifapi.h 
Log Message:
Fix: (FAPI) server_font_data were prematurely reset in zFAPIpassfont.
Thanks for Graham Asher for spotting this.
Also fixes minor bugs in comments.


Index: zfapi.c
===================================================================
RCS file: /cvs/ghostscript/gs/src/zfapi.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- zfapi.c	23 Apr 2002 17:33:32 -0000	1.21
+++ zfapi.c	9 Jul 2002 14:55:03 -0000	1.22
@@ -1425,15 +1425,15 @@
 	    continue;
         }
         pbfont->FAPI_font_data = ff.server_font_data;
-        ff.server_font_data = 0;
 	if (I->get_font_bbox(I, &ff, BBox)) { /* Try to do something to check whether the font is valid. */
             /* Failed, skip this renderer : */
             if (pbfont->FAPI_font_data != 0)
                 I->release_typeface(I, pbfont->FAPI_font_data);
+	    ff.server_font_data = 0;
             pbfont->FAPI_font_data = 0;
             continue;
         }
-        /* fixme : with CID fonts we need to test something more. */
+        /* fixme : with CID fonts we may need to test something more. */
         pbfont->FAPI = I; /* We found a good renderer, so go with it */
         if ((code = name_ref((const byte *)I->ig.d->subtype, strlen(I->ig.d->subtype), &FAPI_ID, false)) < 0)
 	    return code;

Index: ifapi.h
===================================================================
RCS file: /cvs/ghostscript/gs/src/ifapi.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ifapi.h	1 Apr 2002 21:02:49 -0000	1.11
+++ ifapi.h	9 Jul 2002 14:55:03 -0000	1.12
@@ -127,7 +127,6 @@
     FAPI_retcode (*get_font_bbox)(FAPI_server *server, FAPI_font *ff, int BBox[4]);
     FAPI_retcode (*get_font_proportional_feature)(FAPI_server *server, FAPI_font *ff, int subfont, bool *bProportional);
     FAPI_retcode (*can_retrieve_char_by_name)(FAPI_server *server, FAPI_font *ff, FAPI_char_ref *c, int *result);
-/*  FAPI_retcode (*outline_char)(FAPI_server *server, FAPI_font *ff, FAPI_char_ref *c, FAPI_path *p, FAPI_metrics *metrics); */
     FAPI_retcode (*get_char_width)(FAPI_server *server, FAPI_font *ff, FAPI_char_ref *c, FAPI_metrics *metrics);
     FAPI_retcode (*get_char_raster_metrics)(FAPI_server *server, FAPI_font *ff, FAPI_char_ref *c, FAPI_metrics *metrics);
     FAPI_retcode (*get_char_raster)(FAPI_server *server, FAPI_raster *r);




More information about the gs-cvs mailing list