commit 2b3953f133cbe9ffd6d39a0e5849bbd7f624c6ea
parent 9537d534602956553be700f03b95be569ce7d1a7
Author: Frederic Cambus <fcambus@users.sourceforge.net>
Date: Sun, 26 Jul 2015 19:59:38 +0200
Modifying function prototypes + removing bits parameters for ADF, IDF, and XBIN loaders
Diffstat:
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/ansilove.c b/src/ansilove.c
@@ -1018,7 +1018,7 @@ void alAnsiLoader(char *input, char *output, char *retinaout, char *font, char *
}
// PCB
-void alPcBoardLoader(char *input, char output[], char retinaout[], char font[], char bits[], bool createRetinaRep)
+void alPcBoardLoader(char *input, char *output, char *retinaout, char *font, char *bits, bool createRetinaRep)
{
// some type declarations
int32_t font_size_x;
@@ -1412,7 +1412,7 @@ void alPcBoardLoader(char *input, char output[], char retinaout[], char font[],
}
// BINARY
-void alBinaryLoader(char *input, char output[], char retinaout[], char columns[], char font[], char bits[], char icecolors[], bool createRetinaRep)
+void alBinaryLoader(char *input, char *output, char *retinaout, char *columns, char *font, char *bits, char *icecolors, bool createRetinaRep)
{
// some type declarations
int32_t font_size_x;
@@ -1687,7 +1687,7 @@ void alBinaryLoader(char *input, char output[], char retinaout[], char columns[]
}
// ADF
-void alArtworxLoader(char *input, char output[], char retinaout[], char bits[], bool createRetinaRep)
+void alArtworxLoader(char *input, char *output, char *retinaout, bool createRetinaRep)
{
const unsigned char *font_data;
unsigned char *font_data_adf;
@@ -1815,7 +1815,7 @@ void alArtworxLoader(char *input, char output[], char retinaout[], char bits[],
}
// IDF
-void alIcedrawLoader(char *input, char output[], char retinaout[], char bits[], bool fileHasSAUCE, bool createRetinaRep)
+void alIcedrawLoader(char *input, char *output, char *retinaout, bool fileHasSAUCE, bool createRetinaRep)
{
const unsigned char *font_data;
unsigned char *font_data_idf;
@@ -2008,7 +2008,7 @@ void alIcedrawLoader(char *input, char output[], char retinaout[], char bits[],
}
// TUNDRA
-void alTundraLoader(char *input, char output[], char retinaout[], char font[], char bits[], bool fileHasSAUCE, bool createRetinaRep)
+void alTundraLoader(char *input, char *output, char *retinaout, char *font, char *bits, bool fileHasSAUCE, bool createRetinaRep)
{
int32_t columns = 80;
int32_t font_size_x;
@@ -2381,7 +2381,7 @@ void alTundraLoader(char *input, char output[], char retinaout[], char font[], c
}
// XBIN
-void alXbinLoader(char *input, char output[], char retinaout[], char bits[], bool createRetinaRep)
+void alXbinLoader(char *input, char *output, char *retinaout, bool createRetinaRep)
{
const unsigned char *font_data;
unsigned char *font_data_xbin;
diff --git a/src/ansilove.h b/src/ansilove.h
@@ -31,12 +31,12 @@ 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, char *bits, char *icecolors, char *fext, bool createRetinaRep);
-void alPcBoardLoader(char *input, char output[], char retinaout[], char font[], char bits[], bool createRetinaRep);
-void alBinaryLoader(char *input, char output[], char retinaout[], char columns[], char font[], char bits[], char icecolors[], bool createRetinaRep);
-void alArtworxLoader(char *input, char output[], char retinaout[], char bits[], bool createRetinaRep);
-void alIcedrawLoader(char *input, char output[], char retinaout[], char bits[], bool fileHasSAUCE, bool createRetinaRep);
-void alTundraLoader(char *input, char output[], char retinaout[], char font[], char bits[], bool fileHasSAUCE, bool createRetinaRep);
-void alXbinLoader(char *input, char output[], char retinaout[], char bits[], bool createRetinaRep);
+void alPcBoardLoader(char *input, char *output, char *retinaout, char *font, char *bits, bool createRetinaRep);
+void alBinaryLoader(char *input, char *output, char *retinaout, char *columns, char *font, char *bits, char *icecolors, bool createRetinaRep);
+void alArtworxLoader(char *input, char *output, char *retinaout, bool createRetinaRep);
+void alIcedrawLoader(char *input, char *output, char *retinaout, bool fileHasSAUCE, bool createRetinaRep);
+void alTundraLoader(char *input, char *output, char *retinaout, char *font, char *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
@@ -224,11 +224,11 @@ int main(int argc, char *argv[])
}
else if (strcmp(fext, ".adf") == 0) {
// params: input, output, bits
- alArtworxLoader(input, output, retinaout, bits, createRetinaRep);
+ alArtworxLoader(input, output, retinaout, createRetinaRep);
}
else if (strcmp(fext, ".idf") == 0) {
// params: input, output, bits
- alIcedrawLoader(input, output, retinaout, bits, fileHasSAUCE, createRetinaRep);
+ alIcedrawLoader(input, output, retinaout, fileHasSAUCE, createRetinaRep);
}
else if (strcmp(fext, ".tnd") == 0) {
alTundraLoader(input, output, retinaout, font, bits, fileHasSAUCE, createRetinaRep);
@@ -236,7 +236,7 @@ int main(int argc, char *argv[])
}
else if (strcmp(fext, ".xb") == 0) {
// params: input, output, bits
- alXbinLoader(input, output, retinaout, bits, createRetinaRep);
+ alXbinLoader(input, output, retinaout, createRetinaRep);
}
else {
// params: input, output, font, bits, icecolors, fext