aboutsummaryrefslogtreecommitdiff
path: root/libXfont/src/bitmap/bitscale.c
diff options
context:
space:
mode:
Diffstat (limited to 'libXfont/src/bitmap/bitscale.c')
-rw-r--r--libXfont/src/bitmap/bitscale.c11
1 files changed, 4 insertions, 7 deletions
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;
}