diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-05 09:59:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-05 09:59:38 +0100 |
| commit | ffe218bbb0ffa6d2a7f7cbf6b1f81797e667183a (patch) | |
| tree | 233b818e67de2073647e46e91ac688c6b43d5917 /libXfont/src/bitmap/pcfwrite.c | |
| parent | 15a500d3edb03668b43cc6898fafcda024d0f006 (diff) | |
| download | vcxsrv-ffe218bbb0ffa6d2a7f7cbf6b1f81797e667183a.tar.gz vcxsrv-ffe218bbb0ffa6d2a7f7cbf6b1f81797e667183a.tar.bz2 vcxsrv-ffe218bbb0ffa6d2a7f7cbf6b1f81797e667183a.zip | |
libfontenc xserver pixman mesa git update 5 Mar 2012
font-util-1.3.0
xclock-1.0.6
libXfont-1.4.5
inputproto-2.2
Diffstat (limited to 'libXfont/src/bitmap/pcfwrite.c')
| -rw-r--r-- | libXfont/src/bitmap/pcfwrite.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libXfont/src/bitmap/pcfwrite.c b/libXfont/src/bitmap/pcfwrite.c index 3ac07b359..0874c4bd4 100644 --- a/libXfont/src/bitmap/pcfwrite.c +++ b/libXfont/src/bitmap/pcfwrite.c @@ -236,7 +236,8 @@ pcfWriteFont(FontPtr pFont, FontFilePtr file) } offsetProps = malloc(pFont->info.nprops * sizeof(FontPropRec)); if (!offsetProps) { - pcfError("pcfWriteFont(): Couldn't allocate offsetProps (%d*%d)", pFont->info.nprops, sizeof(FontPropRec)); + pcfError("pcfWriteFont(): Couldn't allocate offsetProps (%d*%d)", + pFont->info.nprops, (int) sizeof(FontPropRec)); return AllocError; } prop_string_size = 0; @@ -430,8 +431,8 @@ pcfWriteFont(FontPtr pFont, FontFilePtr file) pcfPutINT16(file, format, pFont->info.defaultCh); for (i = 0; i < nencodings; i++) { if (ACCESSENCODING(bitmapFont->encoding,i)) - pcfPutINT16(file, format, - ACCESSENCODING(bitmapFont->encoding, i) - + pcfPutINT16(file, format, + ACCESSENCODING(bitmapFont->encoding, i) - bitmapFont->metrics); else pcfPutINT16(file, format, 0xFFFF); |