From 6eaea4464631b5d8c1f44a46016163e351028afc Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 5 Sep 2011 10:12:41 +0200 Subject: libXfont-1.4.4 --- libXfont/src/bitmap/bitscale.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'libXfont/src/bitmap/bitscale.c') diff --git a/libXfont/src/bitmap/bitscale.c b/libXfont/src/bitmap/bitscale.c index cf16bffed..50818c66e 100644 --- a/libXfont/src/bitmap/bitscale.c +++ b/libXfont/src/bitmap/bitscale.c @@ -1620,19 +1620,16 @@ BitmapOpenScalable (FontPathElementPtr fpe, if (!sourceFont->refcnt) FontFileCloseFont((FontPathElementPtr) 0, sourceFont); + font->info.props = props; + font->info.nprops = propCount; + font->info.isStringProp = isStringProp; + if (propCount && (!props || !isStringProp)) { - font->info.nprops = 0; - font->info.props = (FontPropPtr)0; - font->info.isStringProp = (char *)0; bitmapUnloadScalable(font); return AllocError; } - font->info.props = props; - font->info.nprops = propCount; - font->info.isStringProp = isStringProp; - *pFont = font; return Successful; } -- cgit v1.2.3