1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
--- 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;
}
}
|
