diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-09-10 09:31:52 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-09-10 09:31:52 +0000 |
| commit | 68b5a21e22ea0d5d2f329d8e756448a3544a49d2 (patch) | |
| tree | 41b8e1ee33c1398bea3ff89d79500caa9101847f /lib/libXfont/src/bitmap | |
| parent | 02af3f817b7b372e650b7f425cd7fd1a78509f2d (diff) | |
Update to libXfont 1.4.4
Diffstat (limited to 'lib/libXfont/src/bitmap')
| -rw-r--r-- | lib/libXfont/src/bitmap/Makefile.in | 7 | ||||
| -rw-r--r-- | lib/libXfont/src/bitmap/bitscale.c | 11 |
2 files changed, 8 insertions, 10 deletions
diff --git a/lib/libXfont/src/bitmap/Makefile.in b/lib/libXfont/src/bitmap/Makefile.in index f0c40186f..cbf53ffa8 100644 --- a/lib/libXfont/src/bitmap/Makefile.in +++ b/lib/libXfont/src/bitmap/Makefile.in @@ -23,9 +23,9 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c +install_sh_DATA = ${SHELL} $(install_sh) -c -m 644 +install_sh_PROGRAM = ${SHELL} $(install_sh) -c +install_sh_SCRIPT = ${SHELL} $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) transform = $(program_transform_name) NORMAL_INSTALL = : @@ -160,6 +160,7 @@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ VERSION = @VERSION@ diff --git a/lib/libXfont/src/bitmap/bitscale.c b/lib/libXfont/src/bitmap/bitscale.c index cf16bffed..50818c66e 100644 --- a/lib/libXfont/src/bitmap/bitscale.c +++ b/lib/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; } |