diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 2000-06-08 10:42:32 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 2000-06-08 10:42:32 +0000 |
| commit | 3103ffad6eedf79f4856cd8255e7b7cca818ed00 (patch) | |
| tree | 0df8d4e0aef5aac8409de46d8dd3785b2184a606 /x11/XFree86-4-libraries/files/patch-s02 | |
| parent | Update to 1.1 version. Also make it respect CFLAGS while I'm here. (diff) | |
Split up XFree86-4 into several pieces. Pretty green, please test with care.
Submitted by: taguchi@tohoku.iij.ad.jp
Approved (in spirit) by: jmz (XFree86 port maintainer)
Notes
Notes:
svn path=/head/; revision=29389
Diffstat (limited to 'x11/XFree86-4-libraries/files/patch-s02')
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-s02 | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-s02 b/x11/XFree86-4-libraries/files/patch-s02 new file mode 100644 index 000000000000..d0d323e13b30 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-s02 @@ -0,0 +1,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; + } + } + |