commit b3bf5fd0ae02664a3cb2bb4e3b655c93132da7d9
parent 76d520b17cff83b6ca4f73383c5df6c9b63993b1
Author: Frederic Cambus <fred@statdns.com>
Date: Sat, 16 Jan 2016 18:06:23 +0100
Moving the PCBoard format loader to its own files
Diffstat:
6 files changed, 266 insertions(+), 238 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/tundra.c src/xbin.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/pcboard.c src/tundra.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
@@ -604,239 +604,3 @@ void alAnsiLoader(char *input, char *output, char *retinaout, char *font, int32_
gdImageDestroy(im_ANSi);
}
-
-// PCB
-void alPcBoardLoader(char *input, char *output, char *retinaout, char *font, int32_t int_bits, bool createRetinaRep)
-{
- // some type declarations
- struct fontStruct fontData;
- int32_t columns = 80;
- int32_t loop, structIndex;
-
- // font selection
- alSelectFont(&fontData, font);
-
- // 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);
-
- // libgd image pointers
- gdImagePtr im_PCB;
-
- // process PCBoard
- int32_t character, current_character, next_character;
- int32_t color_background = 0, color_foreground = 7;
- int32_t position_x = 0, position_y = 0, position_x_max = 0, position_y_max = 0;
-
- // PCB buffer structure array definition
- struct pcbChar *pcboard_buffer, *temp;
-
- // PCB buffer dynamic memory allocation
- pcboard_buffer = malloc(sizeof(struct pcbChar));
-
- // reset loop
- loop = 0;
- structIndex = 0;
-
- while (loop < input_file_size)
- {
- current_character = input_file_buffer[loop];
- next_character = input_file_buffer[loop+1];
-
- if (position_x == 80)
- {
- position_y++;
- position_x = 0;
- }
-
- // CR + LF
- if (current_character == 13 && next_character == 10) {
- position_y++;
- position_x = 0;
- loop++;
- }
-
- // LF
- if (current_character == 10)
- {
- position_y++;
- position_x = 0;
- }
-
- // Tab
- if (current_character==9)
- {
- position_x+=8;
- }
-
- // Sub
- if (current_character == 26)
- {
- break;
- }
-
- // PCB sequence
- if (current_character == 64 && next_character == 88)
- {
- // set graphics rendition
- color_background = input_file_buffer[loop+2];
- color_foreground = input_file_buffer[loop+3];
-
- loop+=3;
- }
- else if (current_character == 64 && next_character == 67 &&
- input_file_buffer[loop+2] == 'L' && input_file_buffer[loop+3] == 'S')
- {
- // erase display
- position_x = 0;
- position_y = 0;
-
- position_x_max = 0;
- position_y_max = 0;
-
- loop+=4;
- }
- else if (current_character == 64 && next_character == 80 && input_file_buffer[loop+2] == 'O'
- && input_file_buffer[loop+3] == 'S' && input_file_buffer[loop+4]== ':')
- {
- // cursor position
- if (input_file_buffer[loop+6]=='@')
- {
- position_x=((input_file_buffer[loop+5])-48)-1;
- loop+=5;
- }
- else
- {
- position_x = (10 * ((input_file_buffer[loop+5])-48) + (input_file_buffer[loop+6])-48)-1;
- loop+=6;
- }
- }
- else if (current_character != 10 && current_character != 13 && current_character != 9)
- {
- // record number of columns and lines used
- if (position_x > position_x_max)
- {
- position_x_max = position_x;
- }
-
- if (position_y > position_y_max)
- {
- position_y_max = position_y;
- }
-
- // reallocate structure array memory
- temp = realloc(pcboard_buffer, (structIndex + 1) * sizeof(struct pcbChar));
- pcboard_buffer = temp;
-
- // write current character in pcbChar structure
- pcboard_buffer[structIndex].position_x = position_x;
- pcboard_buffer[structIndex].position_y = position_y;
- pcboard_buffer[structIndex].color_background = color_background;
- pcboard_buffer[structIndex].color_foreground = color_foreground;
- pcboard_buffer[structIndex].current_character = current_character;
-
- position_x++;
- structIndex++;
- }
- loop++;
- }
- position_x_max++;
- position_y_max++;
-
- // allocate buffer image memory
- im_PCB = gdImageCreate(columns * int_bits, (position_y_max)*fontData.font_size_y);
-
- // allocate black color and create background canvas
- gdImageColorAllocate(im_PCB, 0, 0, 0);
- gdImageFill(im_PCB, 0, 0, 0);
-
- // allocate color palette
- int32_t colors[71];
-
- colors[48] = gdImageColorAllocate(im_PCB, 0, 0, 0);
- colors[49] = gdImageColorAllocate(im_PCB, 0, 0, 170);
- colors[50] = gdImageColorAllocate(im_PCB, 0, 170, 0);
- colors[51] = gdImageColorAllocate(im_PCB, 0, 170, 170);
- colors[52] = gdImageColorAllocate(im_PCB, 170, 0, 0);
- colors[53] = gdImageColorAllocate(im_PCB, 170, 0, 170);
- colors[54] = gdImageColorAllocate(im_PCB, 170, 85, 0);
- colors[55] = gdImageColorAllocate(im_PCB, 170, 170, 170);
- colors[56] = gdImageColorAllocate(im_PCB, 85, 85, 85);
- colors[57] = gdImageColorAllocate(im_PCB, 85, 85, 255);
- colors[65] = gdImageColorAllocate(im_PCB, 85, 255, 85);
- colors[66] = gdImageColorAllocate(im_PCB, 85, 255, 255);
- colors[67] = gdImageColorAllocate(im_PCB, 255, 85, 85);
- colors[68] = gdImageColorAllocate(im_PCB, 255, 85, 255);
- colors[69] = gdImageColorAllocate(im_PCB, 255, 255, 85);
- colors[70] = gdImageColorAllocate(im_PCB, 255, 255, 255);
-
- // the last value of loop tells us how many items are stored in there
- int32_t pcbBufferItems = structIndex;
-
- // render PCB
- for (loop = 0; loop < pcbBufferItems; loop++)
- {
- // grab our chars out of the structure
- position_x = pcboard_buffer[loop].position_x;
- position_y = pcboard_buffer[loop].position_y;
- color_background = pcboard_buffer[loop].color_background;
- color_foreground = pcboard_buffer[loop].color_foreground;
- character = pcboard_buffer[loop].current_character;
-
- alDrawChar(im_PCB, fontData.font_data, int_bits, fontData.font_size_y,
- position_x, position_y, colors[color_background], colors[color_foreground], character);
- }
-
- // create output image
- FILE *file_Out = fopen(output, "wb");
- gdImagePng(im_PCB, 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_PCB
- im_RetinaANSi = gdImageCreate(im_PCB->sx * 2, im_PCB->sy * 2);
-
- gdImageCopyResized(im_RetinaANSi, im_PCB, 0, 0, 0, 0,
- im_RetinaANSi->sx, im_RetinaANSi->sy,
- im_PCB->sx, im_PCB->sy);
-
- // create retina output image
- FILE *file_RetinaOut = fopen(retinaout, "wb");
- gdImagePng(im_RetinaANSi, file_RetinaOut);
- fclose(file_RetinaOut);
-
- gdImageDestroy(im_RetinaANSi);
- }
-
- // free memory
- gdImageDestroy(im_PCB);
-}
diff --git a/src/ansilove.h b/src/ansilove.h
@@ -33,7 +33,6 @@ void alDrawChar(gdImagePtr im, const unsigned char *font_data, int32_t int_bits,
int32_t color_background, int32_t color_foreground, unsigned char character);
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);
// 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 "pcboard.h"
#include "tundra.h"
#include "xbin.h"
diff --git a/src/pcboard.c b/src/pcboard.c
@@ -0,0 +1,247 @@
+//
+// pcboard.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 alPcBoardLoader(char *input, char *output, char *retinaout, char *font, int32_t int_bits, bool createRetinaRep)
+{
+ // some type declarations
+ struct fontStruct fontData;
+ int32_t columns = 80;
+ int32_t loop, structIndex;
+
+ // font selection
+ alSelectFont(&fontData, font);
+
+ // 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);
+
+ // libgd image pointers
+ gdImagePtr im_PCB;
+
+ // process PCBoard
+ int32_t character, current_character, next_character;
+ int32_t color_background = 0, color_foreground = 7;
+ int32_t position_x = 0, position_y = 0, position_x_max = 0, position_y_max = 0;
+
+ // PCB buffer structure array definition
+ struct pcbChar *pcboard_buffer, *temp;
+
+ // PCB buffer dynamic memory allocation
+ pcboard_buffer = malloc(sizeof(struct pcbChar));
+
+ // reset loop
+ loop = 0;
+ structIndex = 0;
+
+ while (loop < input_file_size)
+ {
+ current_character = input_file_buffer[loop];
+ next_character = input_file_buffer[loop+1];
+
+ if (position_x == 80)
+ {
+ position_y++;
+ position_x = 0;
+ }
+
+ // CR + LF
+ if (current_character == 13 && next_character == 10) {
+ position_y++;
+ position_x = 0;
+ loop++;
+ }
+
+ // LF
+ if (current_character == 10)
+ {
+ position_y++;
+ position_x = 0;
+ }
+
+ // Tab
+ if (current_character==9)
+ {
+ position_x+=8;
+ }
+
+ // Sub
+ if (current_character == 26)
+ {
+ break;
+ }
+
+ // PCB sequence
+ if (current_character == 64 && next_character == 88)
+ {
+ // set graphics rendition
+ color_background = input_file_buffer[loop+2];
+ color_foreground = input_file_buffer[loop+3];
+
+ loop+=3;
+ }
+ else if (current_character == 64 && next_character == 67 &&
+ input_file_buffer[loop+2] == 'L' && input_file_buffer[loop+3] == 'S')
+ {
+ // erase display
+ position_x = 0;
+ position_y = 0;
+
+ position_x_max = 0;
+ position_y_max = 0;
+
+ loop+=4;
+ }
+ else if (current_character == 64 && next_character == 80 && input_file_buffer[loop+2] == 'O'
+ && input_file_buffer[loop+3] == 'S' && input_file_buffer[loop+4]== ':')
+ {
+ // cursor position
+ if (input_file_buffer[loop+6]=='@')
+ {
+ position_x=((input_file_buffer[loop+5])-48)-1;
+ loop+=5;
+ }
+ else
+ {
+ position_x = (10 * ((input_file_buffer[loop+5])-48) + (input_file_buffer[loop+6])-48)-1;
+ loop+=6;
+ }
+ }
+ else if (current_character != 10 && current_character != 13 && current_character != 9)
+ {
+ // record number of columns and lines used
+ if (position_x > position_x_max)
+ {
+ position_x_max = position_x;
+ }
+
+ if (position_y > position_y_max)
+ {
+ position_y_max = position_y;
+ }
+
+ // reallocate structure array memory
+ temp = realloc(pcboard_buffer, (structIndex + 1) * sizeof(struct pcbChar));
+ pcboard_buffer = temp;
+
+ // write current character in pcbChar structure
+ pcboard_buffer[structIndex].position_x = position_x;
+ pcboard_buffer[structIndex].position_y = position_y;
+ pcboard_buffer[structIndex].color_background = color_background;
+ pcboard_buffer[structIndex].color_foreground = color_foreground;
+ pcboard_buffer[structIndex].current_character = current_character;
+
+ position_x++;
+ structIndex++;
+ }
+ loop++;
+ }
+ position_x_max++;
+ position_y_max++;
+
+ // allocate buffer image memory
+ im_PCB = gdImageCreate(columns * int_bits, (position_y_max)*fontData.font_size_y);
+
+ // allocate black color and create background canvas
+ gdImageColorAllocate(im_PCB, 0, 0, 0);
+ gdImageFill(im_PCB, 0, 0, 0);
+
+ // allocate color palette
+ int32_t colors[71];
+
+ colors[48] = gdImageColorAllocate(im_PCB, 0, 0, 0);
+ colors[49] = gdImageColorAllocate(im_PCB, 0, 0, 170);
+ colors[50] = gdImageColorAllocate(im_PCB, 0, 170, 0);
+ colors[51] = gdImageColorAllocate(im_PCB, 0, 170, 170);
+ colors[52] = gdImageColorAllocate(im_PCB, 170, 0, 0);
+ colors[53] = gdImageColorAllocate(im_PCB, 170, 0, 170);
+ colors[54] = gdImageColorAllocate(im_PCB, 170, 85, 0);
+ colors[55] = gdImageColorAllocate(im_PCB, 170, 170, 170);
+ colors[56] = gdImageColorAllocate(im_PCB, 85, 85, 85);
+ colors[57] = gdImageColorAllocate(im_PCB, 85, 85, 255);
+ colors[65] = gdImageColorAllocate(im_PCB, 85, 255, 85);
+ colors[66] = gdImageColorAllocate(im_PCB, 85, 255, 255);
+ colors[67] = gdImageColorAllocate(im_PCB, 255, 85, 85);
+ colors[68] = gdImageColorAllocate(im_PCB, 255, 85, 255);
+ colors[69] = gdImageColorAllocate(im_PCB, 255, 255, 85);
+ colors[70] = gdImageColorAllocate(im_PCB, 255, 255, 255);
+
+ // the last value of loop tells us how many items are stored in there
+ int32_t pcbBufferItems = structIndex;
+
+ // render PCB
+ for (loop = 0; loop < pcbBufferItems; loop++)
+ {
+ // grab our chars out of the structure
+ position_x = pcboard_buffer[loop].position_x;
+ position_y = pcboard_buffer[loop].position_y;
+ color_background = pcboard_buffer[loop].color_background;
+ color_foreground = pcboard_buffer[loop].color_foreground;
+ character = pcboard_buffer[loop].current_character;
+
+ alDrawChar(im_PCB, fontData.font_data, int_bits, fontData.font_size_y,
+ position_x, position_y, colors[color_background], colors[color_foreground], character);
+ }
+
+ // create output image
+ FILE *file_Out = fopen(output, "wb");
+ gdImagePng(im_PCB, 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_PCB
+ im_RetinaANSi = gdImageCreate(im_PCB->sx * 2, im_PCB->sy * 2);
+
+ gdImageCopyResized(im_RetinaANSi, im_PCB, 0, 0, 0, 0,
+ im_RetinaANSi->sx, im_RetinaANSi->sy,
+ im_PCB->sx, im_PCB->sy);
+
+ // create retina output image
+ FILE *file_RetinaOut = fopen(retinaout, "wb");
+ gdImagePng(im_RetinaANSi, file_RetinaOut);
+ fclose(file_RetinaOut);
+
+ gdImageDestroy(im_RetinaANSi);
+ }
+
+ // free memory
+ gdImageDestroy(im_PCB);
+}
diff --git a/src/pcboard.h b/src/pcboard.h
@@ -0,0 +1,17 @@
+//
+// pcboard.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 pcboard_h
+#define pcboard_h
+
+void alPcBoardLoader(char *input, char *output, char *retinaout, char *font, int32_t int_bits, bool createRetinaRep);
+
+#endif
