diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 16:04:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-08 16:04:33 (GMT) |
| commit | 089a364ffa502039ae4d42853857206dbeddc250 (patch) | |
| tree | 4701b3aff5e43914b137d6bc202f02192bc0c9c0 /unix/tkUnixFont.c | |
| parent | 611539b46b3f35feff024c8e9c22b8bf93a025d8 (diff) | |
| parent | 10bca5a542048ae2e11701980f2997e26ce28433 (diff) | |
| download | tk-089a364ffa502039ae4d42853857206dbeddc250.zip tk-089a364ffa502039ae4d42853857206dbeddc250.tar.gz tk-089a364ffa502039ae4d42853857206dbeddc250.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'unix/tkUnixFont.c')
| -rw-r--r-- | unix/tkUnixFont.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c index 400e610..60da06b 100644 --- a/unix/tkUnixFont.c +++ b/unix/tkUnixFont.c @@ -705,7 +705,7 @@ TkpGetNativeFont( if (name[0] == '-') { if (name[1] != '*') { - char *dash; + const char *dash; dash = strchr(name + 1, '-'); if ((dash == NULL) || (isspace(UCHAR(dash[-1])))) { @@ -1713,7 +1713,7 @@ InitFont( * 1/3 the width of a capital I. */ - fontPtr->barHeight = fontPtr->widths['I'] / 3; + fontPtr->barHeight = fontPtr->widths[(unsigned char)'I'] / 3; if (fontPtr->barHeight == 0) { fontPtr->barHeight = 1; } @@ -2109,10 +2109,10 @@ FindSubFontForChar( nameList = ListFonts(fontPtr->display, "*", &numNames); for (i = 0; i < numNames; i++) { - fallback = strchr(nameList[i] + 1, '-') + 1; - strchr(fallback, '-')[0] = '\0'; - if (SeenName(fallback, &ds) == 0) { - subFontPtr = CanUseFallback(fontPtr, fallback, ch, + char *fallbck = strchr(nameList[i] + 1, '-') + 1; + strchr(fallbck, '-')[0] = '\0'; + if (SeenName(fallbck, &ds) == 0) { + subFontPtr = CanUseFallback(fontPtr, fallbck, ch, fixSubFontPtrPtr); if (subFontPtr != NULL) { XFreeFontNames(nameList); |