3103ffad6e
Submitted by: taguchi@tohoku.iij.ad.jp Approved (in spirit) by: jmz (XFree86 port maintainer)
55 lines
1.7 KiB
Text
55 lines
1.7 KiB
Text
--- extras/X-TrueType/xttcconv.c.xtt Mon May 8 16:28:29 2000
|
|
+++ extras/X-TrueType/xttcconv.c Mon May 8 16:28:33 2000
|
|
@@ -505,17 +505,19 @@ codeconv_search_code_converter(char cons
|
|
|
|
{
|
|
char **l;
|
|
- char **tryItFirst = NULL;
|
|
+ char **tryItFirst = NULL;
|
|
|
|
for (l=list; *l ; l++) {
|
|
- if(!mystrcasecmp(*l,moduleArg.charSetHints->charsetStdName))
|
|
- tryItFirst = l;
|
|
- }
|
|
+ if(!mystrcasecmp(*l,moduleArg.charSetHints->charsetStdName)) {
|
|
+ tryItFirst = l;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
|
|
- if(tryItFirst)
|
|
- l = tryItFirst;
|
|
- else
|
|
- l = list;
|
|
+ if(tryItFirst)
|
|
+ l = tryItFirst;
|
|
+ else
|
|
+ l = list;
|
|
|
|
while(*l && !isFound) {
|
|
/* load and call module */
|
|
--- extras/X-TrueType/xttfuncs.c.xtt Mon May 8 16:28:29 2000
|
|
+++ extras/X-TrueType/xttfuncs.c Mon May 8 16:28:33 2000
|
|
@@ -702,7 +702,7 @@ get_metrics(FreeTypeFont *ft, int c, str
|
|
|
|
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);
|
|
@@ -790,10 +790,9 @@ get_glyph(FreeTypeFont *ft, int c, int s
|
|
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;
|
|
}
|
|
}
|
|
|