commit 77458a32de8182eb585c3da9241a2c9721918ae7
parent d2da9a51fce0da57286b3d19547d40579c02c5e2
Author: Frederic Cambus <fred@statdns.com>
Date: Sat, 16 Jan 2016 18:01:05 +0100
Moving the XBin format loader to its own files
Diffstat:
6 files changed, 261 insertions(+), 232 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ find_path(GD_INCLUDE_DIRS gd.h)
find_library(GD_LIBRARIES NAMES gd REQUIRED)
include_directories(${GD_INCLUDE_DIRS})
-set(SRC src/main.c src/albinfonts.c src/ansilove.c src/artworx.c src/binary.c src/icedraw.c src/explode.c src/filesize.c src/strtolower.c src/substr.c src/sauce.c)
+set(SRC src/main.c src/albinfonts.c src/ansilove.c src/artworx.c src/binary.c src/icedraw.c src/xbin.c src/explode.c src/filesize.c src/strtolower.c src/substr.c src/sauce.c)
if(NOT HAVE_STRTONUM)
set (SRC ${SRC} compat/strtonum.c)
diff --git a/src/ansilove.c b/src/ansilove.c
@@ -1071,233 +1071,3 @@ void alTundraLoader(char *input, char *output, char *retinaout, char *font, int3
gdImageDestroy(im_Tundra);
}
-// XBIN
-void alXbinLoader(char *input, char *output, char *retinaout, bool createRetinaRep)
-{
- const unsigned char *font_data;
- unsigned char *font_data_xbin;
-
- // load input file
- FILE *input_file = fopen(input, "r");
- if (input_file == NULL) {
- fputs("\nFile error.\n\n", stderr); exit (1);
- }
-
- // get the file size (bytes)
- size_t get_file_size = filesize(input);
- int32_t input_file_size = (int32_t)get_file_size;
-
- // next up is loading our file into a dynamically allocated memory buffer
- unsigned char *input_file_buffer;
- int32_t result;
-
- // allocate memory to contain the whole file
- input_file_buffer = (unsigned char *) malloc(sizeof(unsigned char)*input_file_size);
- if (input_file_buffer == NULL) {
- fputs ("\nMemory error.\n\n", stderr); exit (2);
- }
-
- // copy the file into the buffer
- result = fread(input_file_buffer, 1, input_file_size, input_file);
- if (result != input_file_size) {
- fputs ("\nReading error.\n\n", stderr); exit (3);
- } // whole file is now loaded into input_file_buffer
-
- // close input file, we don't need it anymore
- fclose(input_file);
-
- if (strncmp((char *)input_file_buffer, "XBIN\x1a", 5) != 0) {
- fputs("\nNot an XBin.\n\n", stderr); exit (4);
- }
-
- int32_t xbin_width = (input_file_buffer[ 6 ] << 8) + input_file_buffer[ 5 ];
- int32_t xbin_height = (input_file_buffer[ 8 ] << 8) + input_file_buffer[ 7 ];
- int32_t xbin_fontsize = input_file_buffer[ 9 ];
- int32_t xbin_flags = input_file_buffer[ 10 ];
-
- gdImagePtr im_XBIN;
-
- im_XBIN = gdImageCreate(8 * xbin_width, xbin_fontsize * xbin_height);
-
- if (!im_XBIN) {
- fputs ("\nError, can't allocate buffer image memory.\n\n", stderr); exit (6);
- }
-
- // allocate black color
- gdImageColorAllocate(im_XBIN, 0, 0, 0);
-
- int32_t colors[16];
- int32_t offset = 11;
-
- // palette
- if( (xbin_flags & 1) == 1 ) {
- int32_t loop;
- int32_t index;
-
- for (loop = 0; loop < 16; loop++)
- {
- index = (loop * 3) + offset;
-
- colors[loop] = gdImageColorAllocate(im_XBIN, (input_file_buffer[index] << 2 | input_file_buffer[index] >> 4),
- (input_file_buffer[index + 1] << 2 | input_file_buffer[index + 1] >> 4),
- (input_file_buffer[index + 2] << 2 | input_file_buffer[index + 2] >> 4));
- }
-
- offset += 48;
- }
- else {
- colors[0] = gdImageColorAllocate(im_XBIN, 0, 0, 0);
- colors[1] = gdImageColorAllocate(im_XBIN, 0, 0, 170);
- colors[2] = gdImageColorAllocate(im_XBIN, 0, 170, 0);
- colors[3] = gdImageColorAllocate(im_XBIN, 0, 170, 170);
- colors[4] = gdImageColorAllocate(im_XBIN, 170, 0, 0);
- colors[5] = gdImageColorAllocate(im_XBIN, 170, 0, 170);
- colors[6] = gdImageColorAllocate(im_XBIN, 170, 85, 0);
- colors[7] = gdImageColorAllocate(im_XBIN, 170, 170, 170);
- colors[8] = gdImageColorAllocate(im_XBIN, 85, 85, 85);
- colors[9] = gdImageColorAllocate(im_XBIN, 85, 85, 255);
- colors[10] = gdImageColorAllocate(im_XBIN, 85, 255, 85);
- colors[11] = gdImageColorAllocate(im_XBIN, 85, 255, 255);
- colors[12] = gdImageColorAllocate(im_XBIN, 255, 85, 85);
- colors[13] = gdImageColorAllocate(im_XBIN, 255, 85, 255);
- colors[14] = gdImageColorAllocate(im_XBIN, 255, 255, 85);
- colors[15] = gdImageColorAllocate(im_XBIN, 255, 255, 255);
- }
-
- // font
- if( (xbin_flags & 2) == 2 ) {
- int32_t numchars = ( xbin_flags & 0x10 ? 512 : 256 );
-
- // allocate memory to contain the XBin font
- font_data_xbin = (unsigned char *) malloc(sizeof(unsigned char)*(xbin_fontsize * numchars));
- if (font_data_xbin == NULL) {
- fputs ("\nMemory error.\n\n", stderr); exit (5);
- }
- memcpy(font_data_xbin,input_file_buffer+offset,(xbin_fontsize * numchars));
-
- font_data=font_data_xbin;
-
- offset += ( xbin_fontsize * numchars );
- }
- else {
- // using default 80x25 font
- font_data = font_pc_80x25;
- }
-
- int32_t position_x = 0, position_y = 0;
- int32_t character, attribute, color_foreground, color_background;
-
- // read compressed xbin
- if( (xbin_flags & 4) == 4) {
- while(offset < input_file_size && position_y != xbin_height )
- {
- int32_t ctype = input_file_buffer[ offset ] & 0xC0;
- int32_t counter = ( input_file_buffer[ offset ] & 0x3F ) + 1;
-
- character = -1;
- attribute = -1;
-
- offset++;
- while( counter-- ) {
- // none
- if( ctype == 0 ) {
- character = input_file_buffer[ offset ];
- attribute = input_file_buffer[ offset + 1 ];
- offset += 2;
- }
- // char
- else if ( ctype == 0x40 ) {
- if( character == -1 ) {
- character = input_file_buffer[ offset ];
- offset++;
- }
- attribute = input_file_buffer[ offset ];
- offset++;
- }
- // attr
- else if ( ctype == 0x80 ) {
- if( attribute == -1 ) {
- attribute = input_file_buffer[ offset ];
- offset++;
- }
- character = input_file_buffer[ offset ];
- offset++;
- }
- // both
- else {
- if( character == -1 ) {
- character = input_file_buffer[ offset ];
- offset++;
- }
- if( attribute == -1 ) {
- attribute = input_file_buffer[ offset ];
- offset++;
- }
- }
-
- color_background = (attribute & 240) >> 4;
- color_foreground = attribute & 15;
-
- alDrawChar(im_XBIN, font_data, 8, 16, position_x, position_y, colors[color_background], colors[color_foreground], character);
-
- position_x++;
-
- if (position_x == xbin_width)
- {
- position_x = 0;
- position_y++;
- }
- }
- }
- }
- // read uncompressed xbin
- else {
- while(offset < input_file_size && position_y != xbin_height )
- {
- if (position_x == xbin_width)
- {
- position_x = 0;
- position_y++;
- }
-
- character = input_file_buffer[offset];
- attribute = input_file_buffer[offset+1];
-
- color_background = (attribute & 240) >> 4;
- color_foreground = attribute & 15;
-
- alDrawChar(im_XBIN, font_data, 8, xbin_fontsize, position_x, position_y, colors[color_background], colors[color_foreground], character);
-
- position_x++;
- offset+=2;
- }
- }
-
- // create output file
- FILE *file_Out = fopen(output, "wb");
- gdImagePng(im_XBIN, file_Out);
- fclose(file_Out);
-
- // in case Retina image output is wanted
- if (createRetinaRep)
- {
- gdImagePtr im_RetinaANSi;
-
- // make the Retina image @2x as large as im_XBIN
- im_RetinaANSi = gdImageCreate(im_XBIN->sx * 2, im_XBIN->sy * 2);
-
- gdImageCopyResized(im_RetinaANSi, im_XBIN, 0, 0, 0, 0,
- im_RetinaANSi->sx, im_RetinaANSi->sy,
- im_XBIN->sx, im_XBIN->sy);
-
- // create retina output image
- FILE *file_RetinaOut = fopen(retinaout, "wb");
- gdImagePng(im_RetinaANSi, file_RetinaOut);
- fclose(file_RetinaOut);
-
- gdImageDestroy(im_RetinaANSi);
- }
-
- // nuke garbage
- gdImageDestroy(im_XBIN);
-}
diff --git a/src/ansilove.h b/src/ansilove.h
@@ -35,7 +35,6 @@ void alDrawChar(gdImagePtr im, const unsigned char *font_data, int32_t int_bits,
void alAnsiLoader(char *input, char *output, char *retinaout, char *font, int32_t int_bits, char *mode, bool icecolors, char *fext, bool createRetinaRep);
void alPcBoardLoader(char *input, char *output, char *retinaout, char *font, int32_t int_bits, bool createRetinaRep);
void alTundraLoader(char *input, char *output, char *retinaout, char *font, int32_t int_bits, bool fileHasSAUCE, bool createRetinaRep);
-void alXbinLoader(char *input, char *output, char *retinaout, bool createRetinaRep);
// helper functions
char *str_replace(const char *string, const char *substr, const char *replacement);
diff --git a/src/main.c b/src/main.c
@@ -28,6 +28,7 @@
#include "artworx.h"
#include "binary.h"
#include "icedraw.h"
+#include "xbin.h"
// prototypes
void showHelp(void);
diff --git a/src/xbin.c b/src/xbin.c
@@ -0,0 +1,242 @@
+//
+// xbin.c
+// AnsiLove/C
+//
+// Copyright (C) 2011-2016 Stefan Vogt, Brian Cassidy, Frederic Cambus.
+// All rights reserved.
+//
+// This source code is licensed under the BSD 3-Clause License.
+// See the file LICENSE for details.
+//
+
+#include "ansilove.h"
+
+void alXbinLoader(char *input, char *output, char *retinaout, bool createRetinaRep)
+{
+ const unsigned char *font_data;
+ unsigned char *font_data_xbin;
+
+ // load input file
+ FILE *input_file = fopen(input, "r");
+ if (input_file == NULL) {
+ fputs("\nFile error.\n\n", stderr); exit (1);
+ }
+
+ // get the file size (bytes)
+ size_t get_file_size = filesize(input);
+ int32_t input_file_size = (int32_t)get_file_size;
+
+ // next up is loading our file into a dynamically allocated memory buffer
+ unsigned char *input_file_buffer;
+ int32_t result;
+
+ // allocate memory to contain the whole file
+ input_file_buffer = (unsigned char *) malloc(sizeof(unsigned char)*input_file_size);
+ if (input_file_buffer == NULL) {
+ fputs ("\nMemory error.\n\n", stderr); exit (2);
+ }
+
+ // copy the file into the buffer
+ result = fread(input_file_buffer, 1, input_file_size, input_file);
+ if (result != input_file_size) {
+ fputs ("\nReading error.\n\n", stderr); exit (3);
+ } // whole file is now loaded into input_file_buffer
+
+ // close input file, we don't need it anymore
+ fclose(input_file);
+
+ if (strncmp((char *)input_file_buffer, "XBIN\x1a", 5) != 0) {
+ fputs("\nNot an XBin.\n\n", stderr); exit (4);
+ }
+
+ int32_t xbin_width = (input_file_buffer[ 6 ] << 8) + input_file_buffer[ 5 ];
+ int32_t xbin_height = (input_file_buffer[ 8 ] << 8) + input_file_buffer[ 7 ];
+ int32_t xbin_fontsize = input_file_buffer[ 9 ];
+ int32_t xbin_flags = input_file_buffer[ 10 ];
+
+ gdImagePtr im_XBIN;
+
+ im_XBIN = gdImageCreate(8 * xbin_width, xbin_fontsize * xbin_height);
+
+ if (!im_XBIN) {
+ fputs ("\nError, can't allocate buffer image memory.\n\n", stderr); exit (6);
+ }
+
+ // allocate black color
+ gdImageColorAllocate(im_XBIN, 0, 0, 0);
+
+ int32_t colors[16];
+ int32_t offset = 11;
+
+ // palette
+ if( (xbin_flags & 1) == 1 ) {
+ int32_t loop;
+ int32_t index;
+
+ for (loop = 0; loop < 16; loop++)
+ {
+ index = (loop * 3) + offset;
+
+ colors[loop] = gdImageColorAllocate(im_XBIN, (input_file_buffer[index] << 2 | input_file_buffer[index] >> 4),
+ (input_file_buffer[index + 1] << 2 | input_file_buffer[index + 1] >> 4),
+ (input_file_buffer[index + 2] << 2 | input_file_buffer[index + 2] >> 4));
+ }
+
+ offset += 48;
+ }
+ else {
+ colors[0] = gdImageColorAllocate(im_XBIN, 0, 0, 0);
+ colors[1] = gdImageColorAllocate(im_XBIN, 0, 0, 170);
+ colors[2] = gdImageColorAllocate(im_XBIN, 0, 170, 0);
+ colors[3] = gdImageColorAllocate(im_XBIN, 0, 170, 170);
+ colors[4] = gdImageColorAllocate(im_XBIN, 170, 0, 0);
+ colors[5] = gdImageColorAllocate(im_XBIN, 170, 0, 170);
+ colors[6] = gdImageColorAllocate(im_XBIN, 170, 85, 0);
+ colors[7] = gdImageColorAllocate(im_XBIN, 170, 170, 170);
+ colors[8] = gdImageColorAllocate(im_XBIN, 85, 85, 85);
+ colors[9] = gdImageColorAllocate(im_XBIN, 85, 85, 255);
+ colors[10] = gdImageColorAllocate(im_XBIN, 85, 255, 85);
+ colors[11] = gdImageColorAllocate(im_XBIN, 85, 255, 255);
+ colors[12] = gdImageColorAllocate(im_XBIN, 255, 85, 85);
+ colors[13] = gdImageColorAllocate(im_XBIN, 255, 85, 255);
+ colors[14] = gdImageColorAllocate(im_XBIN, 255, 255, 85);
+ colors[15] = gdImageColorAllocate(im_XBIN, 255, 255, 255);
+ }
+
+ // font
+ if( (xbin_flags & 2) == 2 ) {
+ int32_t numchars = ( xbin_flags & 0x10 ? 512 : 256 );
+
+ // allocate memory to contain the XBin font
+ font_data_xbin = (unsigned char *) malloc(sizeof(unsigned char)*(xbin_fontsize * numchars));
+ if (font_data_xbin == NULL) {
+ fputs ("\nMemory error.\n\n", stderr); exit (5);
+ }
+ memcpy(font_data_xbin,input_file_buffer+offset,(xbin_fontsize * numchars));
+
+ font_data=font_data_xbin;
+
+ offset += ( xbin_fontsize * numchars );
+ }
+ else {
+ // using default 80x25 font
+ font_data = font_pc_80x25;
+ }
+
+ int32_t position_x = 0, position_y = 0;
+ int32_t character, attribute, color_foreground, color_background;
+
+ // read compressed xbin
+ if( (xbin_flags & 4) == 4) {
+ while(offset < input_file_size && position_y != xbin_height )
+ {
+ int32_t ctype = input_file_buffer[ offset ] & 0xC0;
+ int32_t counter = ( input_file_buffer[ offset ] & 0x3F ) + 1;
+
+ character = -1;
+ attribute = -1;
+
+ offset++;
+ while( counter-- ) {
+ // none
+ if( ctype == 0 ) {
+ character = input_file_buffer[ offset ];
+ attribute = input_file_buffer[ offset + 1 ];
+ offset += 2;
+ }
+ // char
+ else if ( ctype == 0x40 ) {
+ if( character == -1 ) {
+ character = input_file_buffer[ offset ];
+ offset++;
+ }
+ attribute = input_file_buffer[ offset ];
+ offset++;
+ }
+ // attr
+ else if ( ctype == 0x80 ) {
+ if( attribute == -1 ) {
+ attribute = input_file_buffer[ offset ];
+ offset++;
+ }
+ character = input_file_buffer[ offset ];
+ offset++;
+ }
+ // both
+ else {
+ if( character == -1 ) {
+ character = input_file_buffer[ offset ];
+ offset++;
+ }
+ if( attribute == -1 ) {
+ attribute = input_file_buffer[ offset ];
+ offset++;
+ }
+ }
+
+ color_background = (attribute & 240) >> 4;
+ color_foreground = attribute & 15;
+
+ alDrawChar(im_XBIN, font_data, 8, 16, position_x, position_y, colors[color_background], colors[color_foreground], character);
+
+ position_x++;
+
+ if (position_x == xbin_width)
+ {
+ position_x = 0;
+ position_y++;
+ }
+ }
+ }
+ }
+ // read uncompressed xbin
+ else {
+ while(offset < input_file_size && position_y != xbin_height )
+ {
+ if (position_x == xbin_width)
+ {
+ position_x = 0;
+ position_y++;
+ }
+
+ character = input_file_buffer[offset];
+ attribute = input_file_buffer[offset+1];
+
+ color_background = (attribute & 240) >> 4;
+ color_foreground = attribute & 15;
+
+ alDrawChar(im_XBIN, font_data, 8, xbin_fontsize, position_x, position_y, colors[color_background], colors[color_foreground], character);
+
+ position_x++;
+ offset+=2;
+ }
+ }
+
+ // create output file
+ FILE *file_Out = fopen(output, "wb");
+ gdImagePng(im_XBIN, file_Out);
+ fclose(file_Out);
+
+ // in case Retina image output is wanted
+ if (createRetinaRep)
+ {
+ gdImagePtr im_RetinaANSi;
+
+ // make the Retina image @2x as large as im_XBIN
+ im_RetinaANSi = gdImageCreate(im_XBIN->sx * 2, im_XBIN->sy * 2);
+
+ gdImageCopyResized(im_RetinaANSi, im_XBIN, 0, 0, 0, 0,
+ im_RetinaANSi->sx, im_RetinaANSi->sy,
+ im_XBIN->sx, im_XBIN->sy);
+
+ // create retina output image
+ FILE *file_RetinaOut = fopen(retinaout, "wb");
+ gdImagePng(im_RetinaANSi, file_RetinaOut);
+ fclose(file_RetinaOut);
+
+ gdImageDestroy(im_RetinaANSi);
+ }
+
+ // nuke garbage
+ gdImageDestroy(im_XBIN);
+}
diff --git a/src/xbin.h b/src/xbin.h
@@ -0,0 +1,17 @@
+//
+// xbin.h
+// AnsiLove/C
+//
+// Copyright (C) 2011-2016 Stefan Vogt, Brian Cassidy, Frederic Cambus.
+// All rights reserved.
+//
+// This source code is licensed under the BSD 3-Clause License.
+// See the file LICENSE for details.
+//
+
+#ifndef xbin_h
+#define xbin_h
+
+void alXbinLoader(char *input, char *output, char *retinaout, bool createRetinaRep);
+
+#endif
