summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Häggqvist <rasher@rasher.dk>2012-10-14 12:12:25 +0200
committerBertrik Sikken <bertrik@sikken.nl>2012-10-14 12:12:25 +0200
commit3d35f143515d0f828d4cfde2ad676f719f24ee16 (patch)
tree7872fdd9b76b214b5d9d57b84d4719fd58a371c0
parent7a7d7a2f4ca1d2474df768e2698dc9e158ba1bb0 (diff)
downloadrockbox-3d35f143515d0f828d4cfde2ad676f719f24ee16.zip
rockbox-3d35f143515d0f828d4cfde2ad676f719f24ee16.tar.gz
rockbox-3d35f143515d0f828d4cfde2ad676f719f24ee16.tar.bz2
rockbox-3d35f143515d0f828d4cfde2ad676f719f24ee16.tar.xz
FS#12764 - bdf2bmp fails to compile
Change-Id: I8e5ea31f0b529c0160ce6bdaa21a7d3dfe6c391d
-rw-r--r--tools/bdf2bmp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/bdf2bmp.c b/tools/bdf2bmp.c
index 5422a65..a00b39a 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");