diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-05 10:12:41 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-05 10:12:41 +0200 |
| commit | 6eaea4464631b5d8c1f44a46016163e351028afc (patch) | |
| tree | e3bf36f2e13f265a35e6e692adb14b1205df169f /libXfont/src/bitmap/bitscale.c | |
| parent | 8d96b52ac5e6ec4b6a127a8324c803bcf2732c45 (diff) | |
| download | vcxsrv-6eaea4464631b5d8c1f44a46016163e351028afc.tar.gz vcxsrv-6eaea4464631b5d8c1f44a46016163e351028afc.tar.bz2 vcxsrv-6eaea4464631b5d8c1f44a46016163e351028afc.zip | |
libXfont-1.4.4
Diffstat (limited to 'libXfont/src/bitmap/bitscale.c')
| -rw-r--r-- | libXfont/src/bitmap/bitscale.c | 11 |
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; } |