From 3d35f143515d0f828d4cfde2ad676f719f24ee16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=A4ggqvist?= Date: Sun, 14 Oct 2012 12:12:25 +0200 Subject: [PATCH] FS#12764 - bdf2bmp fails to compile Change-Id: I8e5ea31f0b529c0160ce6bdaa21a7d3dfe6c391d --- tools/bdf2bmp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/bdf2bmp.c b/tools/bdf2bmp.c index 5422a65e99..a00b39a5f3 100644 --- a/tools/bdf2bmp.c +++ b/tools/bdf2bmp.c @@ -97,7 +97,7 @@ void checkEndian(void); void dwrite(const void *ptrP, int n, FILE *outP); void writeBmpFile(unsigned char *bitmapP, int spacing, int colchar, FILE *bmpP); void assignBitmap(unsigned char *bitmapP, char *glyphP, int sizeglyphP, struct boundingbox glyph, int dw); -int getline(char* lineP, int max, FILE* inputP); +int getfontline(char* lineP, int max, FILE* inputP); unsigned char *readBdfFile(unsigned char *bitmapP, FILE *readP); void printhelp(void); int main(int argc, char *argv[]); @@ -454,7 +454,7 @@ void assignBitmap(unsigned char *bitmapP, char *glyphP, int sizeglyphP, struct b /* * read oneline from textfile */ -int getline(char* lineP, int max, FILE* inputP){ +int getfontline(char* lineP, int max, FILE* inputP){ if (fgets(lineP, max, inputP) == NULL) return 0; else @@ -479,7 +479,7 @@ unsigned char *readBdfFile(unsigned char *bitmapP, FILE *readP){ static int bdfflag = OFF; /* the given bdf-file is valid or not */ while(1){ - length = getline(sP, LINE_CHARMAX, readP); + length = getfontline(sP, LINE_CHARMAX, readP); if((bdfflag == OFF) && (length == 0)){ /* given input-file is not a bdf-file */ printf("error: input-file is not a bdf file\n");