ansilove

ANSI and ASCII art to PNG converter in C
Log | Files | Refs | README | LICENSE

commit 5546a0fb1822ff6c3fe89f802f29eb13620c8d5f
parent faf059d761eb3134dbc19c8317da1f5780557916
Author: ByteProject <stefan.vogt@byteproject.net>
Date:   Mon, 20 Feb 2012 18:50:01 +0100

the repair sessions - season 1

Diffstat:
Mansilove/ansilove.c | 12+++---------
1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/ansilove/ansilove.c b/ansilove/ansilove.c @@ -12,13 +12,7 @@ #if defined(__APPLE__) && defined(__MACH__) #import "ansilove.h" #else -<<<<<<< HEAD -#include <stdbool.h> #include "ansilove.h" -#include "fonts.h" -======= -#include "ansilove.h" ->>>>>>> moved fonts.h to alfonts.h #endif // ANSi @@ -1964,18 +1958,18 @@ void alTundraLoader(char *input, char output[], char font[], char bits[]) int32_t columns = 80; int32_t font_size_x; int32_t font_size_y; - const unsigned char *font_data; + unsigned char *font_data; char tundra_version; char tundra_header[8]; // determine the font we use to render the output if (strcmp(font, "80x25") == 0) { - font_data = font_pc_80x25; + //font_data = &font_pc_80x25; font_size_x = 8; font_size_y = 16; } else if (strcmp(font, "80x50") == 0) { - font_data = font_pc_80x50; + //font_data = &font_pc_80x50; font_size_x = 8; font_size_y = 8; }