From 593bbd9e900d6dfd9626802ee88cbc577d1d1619 Mon Sep 17 00:00:00 2001 From: ashmew2 Date: Mon, 31 Mar 2014 07:25:24 +0000 Subject: [PATCH] Changed font_conv/convert.c and shifted to contrib git-svn-id: svn://kolibrios.org@4722 a494cfbc-eb01-0410-851d-a64ba20cac60 --- contrib/other/font_conv/convert.c | 198 ++++++++++++++++++++++++++ programs/other/font_conv/convert.c | 57 -------- programs/other/font_conv/convert_et.c | 57 -------- programs/other/font_conv/convert_sp.c | 57 -------- 4 files changed, 198 insertions(+), 171 deletions(-) create mode 100644 contrib/other/font_conv/convert.c delete mode 100644 programs/other/font_conv/convert.c delete mode 100644 programs/other/font_conv/convert_et.c delete mode 100644 programs/other/font_conv/convert_sp.c diff --git a/contrib/other/font_conv/convert.c b/contrib/other/font_conv/convert.c new file mode 100644 index 0000000000..c6bc2d6c14 --- /dev/null +++ b/contrib/other/font_conv/convert.c @@ -0,0 +1,198 @@ +/* + convert.c: converts text bitmaps into binary bitmaps. + This has been written with an aim to detect any errors that + might have crept in while generating a text bitmap for a font. + + Copyright 2011 dunkaist + Copyright 2014 ashmew2 + Distributed under the terms of the GNU General Public License v3. + See http://www.gnu.org/licenses/gpl.txt for the full license text. +*/ + +/* + For TRANSLATION, only the hard coded strings such as in usage[] need to + rewritten in the desired language. The translation selection should be + inside an #if LANG == RUS {} #else {} block. All messsages are printed + using msg_printx() and the translations need to be done for all such + calls. +*/ + +#include +#include +#include +#include +#include +#include + +#define FONT_HEIGHT 9 /* The height of each symbol in input file */ +#define FONT_WIDTH_MONO 5 /* Fixed width for mono fonts */ +#define FONT_WIDTH_VAR 7 /* Max symbol width */ +#define LINE_BUFFER_SIZE 12 /* For FONT_WIDTH_VAR and delimiters */ +#define NUM_SYMBOLS 256 /* Number of symbols in input file */ + +enum error_code { + ERROR_PARSING_ARGS = 1, + ERROR_OPENING_FILE, + ERROR_INVALID_INPUT_FILE +}; + +void msg_printx(int errnum, char *message, ...) +{ + va_list args; + + va_start(args, message); + vfprintf(stderr, message, args); + va_end(args); + + exit(errnum); +} + +void usage_printx(char *prog_name) +{ + char usage[] = "Usage: \n" + "\t%s <-m>\n\n" + "Converts font bitmaps from text to binary format.\n\n" + "\tINPUTFILE\t The input file containing text bitmap.\n" + "\tOUTPUTFILE\t The output file for writing binary bitmap.\n" + "\t-m\t Mono flag. -0 for mono. -1 otherwise.\n\n" + "Examples: \n" + "\t%s char.txt CHAR.MT -0\n" + "\t%s char2.txt CHAR2.MT -1\n\n" + "Exit status: \n" + "\t 0: Successful conversion.\n" + "\t 1: Incorrect arguments supplied to the command.\n" + "\t 2: Files could not be opened for read/write.\n" + "\t 3: Error(s) reading data from file.\n\n" + "This is a part of the font_conv program in KolibriOS.\n"; + + msg_printx(ERROR_PARSING_ARGS, usage, prog_name, prog_name, prog_name); +} + +char* get_row(bool use_mono) +{ + static int line_number = 1; /* Initialize to 1 for first line being read */ + static size_t len_line; + static char line[LINE_BUFFER_SIZE]; + + size_t len; + char *current_line; + int i; + + current_line = fgets(line, LINE_BUFFER_SIZE - 1, stdin); + + if(!current_line) + msg_printx(ERROR_INVALID_INPUT_FILE, "Error: could not read line from input file.\n"); + + len = strlen(current_line); + + if(len > 2) + { + if(line[len - 1] == '\n' && line[len - 2] == '\r') + len -= 2; + else if(line[len - 1] == '\n') + --len; + else if(line_number != ((FONT_HEIGHT + 1) * NUM_SYMBOLS)) /* if last line of input */ + msg_printx(ERROR_INVALID_INPUT_FILE, "Error: line %d: no newline character found in first %d bytes.\n", 12 - 1, line_number); + + line[--len] = '\0'; + } + else + msg_printx(ERROR_INVALID_INPUT_FILE, "Error: line %d: line too short.\n", line_number); + + if(line_number == 1) /* Processing first line in input */ + { + if(len > FONT_WIDTH_VAR) + msg_printx(ERROR_INVALID_INPUT_FILE, "Error: line %d: length of line is larger than %d (maximum allowed width).\n", line_number, FONT_WIDTH_VAR); + + if((use_mono) && (len != FONT_WIDTH_MONO)) + msg_printx(ERROR_INVALID_INPUT_FILE, "Error: line %d: length of line is not equal to %d (mono font width).\n", line_number, FONT_WIDTH_MONO); + + len_line = len; + } + else + { + if(len != len_line) + msg_printx(ERROR_INVALID_INPUT_FILE, "Error: line %d: length of line does not match length of first line in file.\n", line_number); + + /*validate Row*/ + for(i = 0; line[i]; i++) + if(!isprint(line[i])) + msg_printx(ERROR_INVALID_INPUT_FILE, "Error: line %d: non printable characters found on line.\n", line_number); + } + + ++line_number; + + return line; +} + +int do_symbol(short int font_width) +{ + short int row, col; + int data; + + for(row = FONT_HEIGHT; row; row--) + { + char *line = get_row(font_width == FONT_WIDTH_MONO); + + data = 0; /* Create empty byte for storing line */ + + for(col = 0; col < font_width; col++) + { + if(line[col] != ' ') + data |= 1< - Distributed under the terms of the GNU General Public License v3. - See http://www.gnu.org/licenses/gpl.txt for the full license text. -*/ - - -#include - -#define FONT_HEIGHT 9 -#define FONT_WIDTH_MONO 5 -#define FONT_WIDTH_VAR 7 /* max symbol width */ - - short int char_num, row, col; - char ch, data; - - -int do_symbol(short int font_width) -{ - for(row=FONT_HEIGHT; row; row--) - { - data = 0; - for(col=0; col - Distributed under the terms of the GNU General Public License v3. - See http://www.gnu.org/licenses/gpl.txt for the full license text. -*/ - - -#include - -#define FONT_HEIGHT 9 -#define FONT_WIDTH_MONO 5 -#define FONT_WIDTH_VAR 7 /* max symbol width */ - - short int char_num, row, col; - char ch, data; - - -int do_symbol(short int font_width) -{ - for(row=FONT_HEIGHT; row; row--) - { - data = 0; - for(col=0; col - Distributed under the terms of the GNU General Public License v3. - See http://www.gnu.org/licenses/gpl.txt for the full license text. -*/ - - -#include - -#define FONT_HEIGHT 9 -#define FONT_WIDTH_MONO 5 -#define FONT_WIDTH_VAR 7 /* max symbol width */ - - short int char_num, row, col; - char ch, data; - - -int do_symbol(short int font_width) -{ - for(row=FONT_HEIGHT; row; row--) - { - data = 0; - for(col=0; col