aboutsummaryrefslogtreecommitdiff
path: root/libXfont/src/bitmap
diff options
context:
space:
mode:
Diffstat (limited to 'libXfont/src/bitmap')
-rw-r--r--libXfont/src/bitmap/bitmapfunc.c6
-rw-r--r--libXfont/src/bitmap/bitmaputil.c4
-rw-r--r--libXfont/src/bitmap/bitscale.c2
-rw-r--r--libXfont/src/bitmap/makefile20
4 files changed, 26 insertions, 6 deletions
diff --git a/libXfont/src/bitmap/bitmapfunc.c b/libXfont/src/bitmap/bitmapfunc.c
index e980dfbcc..670c0a900 100644
--- a/libXfont/src/bitmap/bitmapfunc.c
+++ b/libXfont/src/bitmap/bitmapfunc.c
@@ -107,6 +107,7 @@ static BitmapFileFunctionsRec readers[] = {
#if XFONT_PCFFORMAT
{ pmfReadFont, pcfReadFontInfo} ,
#endif
+ { NULL, NULL }
};
@@ -238,11 +239,12 @@ static FontRendererRec renderers[] = {
#if XFONT_PCFFORMAT
{ ".pmf", 4, BitmapOpenBitmap, BitmapOpenScalable,
BitmapGetInfoBitmap, BitmapGetInfoScalable, 0,
- CAPABILITIES }
+ CAPABILITIES },
#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 3487f7f92..43f93ca6e 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/bitscale.c b/libXfont/src/bitmap/bitscale.c
index ffdbe1d3c..aedf5ee84 100644
--- a/libXfont/src/bitmap/bitscale.c
+++ b/libXfont/src/bitmap/bitscale.c
@@ -138,6 +138,7 @@ static const ScaleFunc scale[] =
#if XFONT_PCFFORMAT
PrinterScaleBitmaps,
#endif
+ NULL
};
static FontEntryPtr FindBestToScale ( FontPathElementPtr fpe,
@@ -188,6 +189,7 @@ static const FindToScale find_scale[] =
#if XFONT_PCFFORMAT
FindPmfToScale,
#endif
+ 0
};
static unsigned long bitscaleGeneration = 0; /* initialization flag */
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
+