From 7981dbc8220bbf8c2ef4a20752fb77e1de671003 Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Tue, 30 Dec 2008 22:40:05 +0000 Subject: [PATCH] imlib2/ttf loading tweaks. SVN revision: 38363 --- dox/text.c | 3 +-- src/ttfont.c | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dox/text.c b/dox/text.c index 47240334..54712f90 100644 --- a/dox/text.c +++ b/dox/text.c @@ -77,8 +77,7 @@ TextStateLoadFont(TextState * ts) if (ss) { *ss = ' '; - word(s2, 1, w); - sprintf(s, "%s.ttf", w); + word(s2, 1, s); word(s2, 2, w); ts->efont = Efont_load(s, atoi(w)); if (ts->efont) diff --git a/src/ttfont.c b/src/ttfont.c index a3b24ce2..e4a66f51 100644 --- a/src/ttfont.c +++ b/src/ttfont.c @@ -125,9 +125,8 @@ _ift_Load(TextState * ts, const char *name __UNUSED__) if (len > 1000) return -1; - Esnprintf(s, sizeof(s) - 8, "%s.ttf", ts->fontname); - strncpy(s, ts->fontname, len); - strcpy(s + len, ".ttf"); + memcpy(s, ts->fontname, len); + s[len] = '\0'; font = Efont_load(s, atoi(ss + 1)); if (!font) return -1;