diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..3da3081 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.c text eol=lf diff=cpp whitespace=trailing-space,space-before-tab,tab-in-indent +*.h text eol=lf diff=cpp whitespace=trailing-space,space-before-tab,tab-in-indent \ No newline at end of file diff --git a/src/args.c b/src/args.c index e69de29..29bae42 100644 --- a/src/args.c +++ b/src/args.c @@ -0,0 +1,9 @@ +#include "args.h" + +parameters parse_args(int argc, char **argv) { + parameters params; + + // TODO + + return params; +} \ No newline at end of file diff --git a/src/args.h b/src/args.h index e69de29..b91c4bd 100644 --- a/src/args.h +++ b/src/args.h @@ -0,0 +1,17 @@ +#ifndef ARGS_H +#define ARGS_H + +struct Parameters { + unsigned long width; + unsigned long height; + char *file_path; + unsigned char start[3]; + unsigned char slope[2]; + unsigned char var[3]; +}; + +typedef struct Parameters parameters; + +parameters parse_args(int argc, char **argv); + +#endif \ No newline at end of file diff --git a/src/bmp.c b/src/bmp.c index 40e49a9..e64f4a1 100644 --- a/src/bmp.c +++ b/src/bmp.c @@ -1,3 +1,4 @@ +#include "bmp.h" #include #include @@ -70,7 +71,7 @@ char *bmp_data_line(unsigned long width, unsigned int color_depth, char *data) { void bmp_generate(unsigned long width, unsigned long height, unsigned int color_depth, char *file_path, - void generate_line(unsigned long y, char *data_buffer)) { + line_fn generate_line) { FILE *fptr; fptr = fopen(file_path, "w"); char *header = bmp_header(width, height, color_depth); diff --git a/src/bmp.h b/src/bmp.h index 08d66c7..034d813 100644 --- a/src/bmp.h +++ b/src/bmp.h @@ -1,4 +1,10 @@ +#ifndef BMP_H +#define BMP_H + typedef void line_fn(unsigned long y, char *data_buffer); void bmp_generate(unsigned long width, unsigned long height, - unsigned int color_depth, char *file_path, line_fn); \ No newline at end of file + unsigned int color_depth, char *file_path, + line_fn generate_line); + +#endif \ No newline at end of file diff --git a/src/generator.c b/src/generator.c index 8e42236..dfe21c0 100644 --- a/src/generator.c +++ b/src/generator.c @@ -1,3 +1,4 @@ +#include "args.h" #include "bmp.h" #include @@ -9,6 +10,7 @@ void generate_line(unsigned long y, char *data_buffer) { memset(data_buffer, y, WIDTH * COLOR_DEPTH); } -void generate() { +void generate(parameters params) { + // TODO bmp_generate(WIDTH, HEIGHT, COLOR_DEPTH, "test.bmp", generate_line); } \ No newline at end of file diff --git a/src/generator.h b/src/generator.h index f8ca05d..63cbc56 100644 --- a/src/generator.h +++ b/src/generator.h @@ -1 +1,8 @@ -void generate(); \ No newline at end of file +#include "args.h" + +#ifndef GENERATOR_H +#define GENERATOR_H + +void generate(parameters params); + +#endif \ No newline at end of file diff --git a/src/main.c b/src/main.c index c0c82e7..f35de5c 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,9 @@ +#include "args.h" #include "generator.h" int main(int argc, char **argv) { - generate(); + parameters params; + params = parse_args(argc, argv); + generate(params); return 0; } \ No newline at end of file diff --git a/src/main.h b/src/main.h index e69de29..b0790ce 100644 --- a/src/main.h +++ b/src/main.h @@ -0,0 +1,4 @@ +#ifndef MAIN_H +#define MAIN_H + +#endif \ No newline at end of file diff --git a/src/rand.h b/src/rand.h index e69de29..ce1b2fa 100644 --- a/src/rand.h +++ b/src/rand.h @@ -0,0 +1,4 @@ +#ifndef RAND_H +#define RAND_H + +#endif \ No newline at end of file