diff options
Diffstat (limited to 'libXfont/src/bitmap')
| -rw-r--r-- | libXfont/src/bitmap/bitmapfunc.c | 4 | ||||
| -rw-r--r-- | libXfont/src/bitmap/bitmaputil.c | 4 | ||||
| -rw-r--r-- | libXfont/src/bitmap/makefile | 20 |
3 files changed, 23 insertions, 5 deletions
diff --git a/libXfont/src/bitmap/bitmapfunc.c b/libXfont/src/bitmap/bitmapfunc.c index 80d7da19d..a171d8436 100644 --- a/libXfont/src/bitmap/bitmapfunc.c +++ b/libXfont/src/bitmap/bitmapfunc.c @@ -105,6 +105,7 @@ static BitmapFileFunctionsRec readers[] = { { bdfReadFont, bdfReadFontInfo} , # endif #endif + { NULL, NULL } }; @@ -233,9 +234,10 @@ static FontRendererRec renderers[] = { CAPABILITIES }, # endif #endif + { NULL, 0, NULL, 0, NULL, NULL, 0, 0 } }; -#define numRenderers (sizeof renderers / sizeof renderers[0]) +#define numRenderers (sizeof renderers / sizeof renderers[0] - 1) void BitmapRegisterFontFileFunctions (void) diff --git a/libXfont/src/bitmap/bitmaputil.c b/libXfont/src/bitmap/bitmaputil.c index 3a7bbc7a0..545a547c2 100644 --- a/libXfont/src/bitmap/bitmaputil.c +++ b/libXfont/src/bitmap/bitmaputil.c @@ -37,13 +37,9 @@ from The Open Group. #include <X11/fonts/bitmap.h> #include <X11/fonts/bdfint.h> -#ifndef MAXSHORT #define MAXSHORT 32767 -#endif -#ifndef MINSHORT #define MINSHORT -32768 -#endif static xCharInfo initMinMetrics = { MAXSHORT, MAXSHORT, MAXSHORT, MAXSHORT, MAXSHORT, 0xFFFF}; diff --git a/libXfont/src/bitmap/makefile b/libXfont/src/bitmap/makefile new file mode 100644 index 000000000..9faa86a30 --- /dev/null +++ b/libXfont/src/bitmap/makefile @@ -0,0 +1,20 @@ +LIBRARY = libbitmap + +CSRCS = \ + bdfread.c \ + bdfutils.c \ + bitmap.c \ + bitmapfunc.c \ + bitmaputil.c \ + bitscale.c \ + fontink.c \ + pcfread.c \ + pcfwrite.c \ + snfread.c + +#DEFINES += XFONT_PCFFORMAT XFONT_SNFFORMAT XFONT_BDFFORMAT X_GZIP_FONT_COMPRESSION + +INCLUDES := ../../../../build $(INCLUDES) + +#INCLUDE=$(INCLUDE);..\..\include\X11;..\..\src\xlibi18n;..\..\src + |