1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-31 21:57:12 +00:00
freebsd-ports/x11-servers/XttXF86srv-common/files/patch-z02
Akinori MUSHA c554962384 Update the base XFree86 to 3.3.6.
PR:		ports/19372
Submitted by:	Taguchi, Takesi <taguchi@tohoku.iij.ad.jp> (Maintainer)
2000-06-22 13:19:33 +00:00

25 lines
940 B
Plaintext

--- lib/font/X-TrueType/xttfuncs.c.ORIG Mon Jun 19 11:38:08 2000
+++ lib/font/X-TrueType/xttfuncs.c Mon Jun 19 11:41:00 2000
@@ -698,7 +698,7 @@
if ((entry = FontCacheGetEntry()) == NULL) {
charInfo = &nocharinfo;
- fprintf(stderr, "can't get cache entry\n");
+ fprintf(stderr, "get_metrics: can't get cache entry\n");
goto next;
}
FC_TT_SETVFUNC(entry);
@@ -786,10 +786,9 @@
char_width.pixel = char_width.raw = 0;
get_metrics(ft, c, char_width);
/* Retry to get it created in get_metrics(). */
- FontCacheSearchEntry(ft->cache, c, &entry);
- if (!charInfo) {
+ if (!FontCacheSearchEntry(ft->cache, c, &entry)) {
charInfo = &nocharinfo;
- fprintf(stderr, "can't get cache entry\n");
+ fprintf(stderr, "get_glyph: can't get cache entry\n");
goto next;
}
}