diff --git a/.gitignore b/.gitignore index f07a905..add1a91 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ tools/mkfimg tools/png2fimg tools/addtga2fimg tools/addpnm2fimg +tools/cumulfimgs diff --git a/floatimg.h b/floatimg.h index dba2cf5..f5a0b33 100644 --- a/floatimg.h +++ b/floatimg.h @@ -2,7 +2,7 @@ * floatimg.h */ -#define FIMG_VERSION 60 +#define FIMG_VERSION 61 /* * in memory descriptor diff --git a/tools/cumulfimgs.c b/tools/cumulfimgs.c new file mode 100644 index 0000000..5ac8c36 --- /dev/null +++ b/tools/cumulfimgs.c @@ -0,0 +1,34 @@ +#include +#include +#include + +#include "../floatimg.h" + +int verbosity; +/* --------------------------------------------------------------------- */ +void help(int v) +{ +puts("options :"); +puts("\t-v\tincrease verbosity"); +puts("\t-o\tname of output file"); + +if (verbosity) { puts(""); fimg_print_version(1); } +} +/* --------------------------------------------------------------------- */ +int main(int argc, char *argv[]) +{ +int foo; +int opt; +char *output_file = "noname.fimg"; + +while ((opt = getopt(argc, argv, "ho:v")) != -1) { + switch(opt) { + case 'h': help(0); break; + case 'o': output_file = optarg; break; + case 'v': verbosity++; break; + } + } + +return 0; +} +/* --------------------------------------------------------------------- */ diff --git a/tools/fimg2pnm.c b/tools/fimg2pnm.c index 8a64026..017c1d1 100644 --- a/tools/fimg2pnm.c +++ b/tools/fimg2pnm.c @@ -1,3 +1,7 @@ +/* + * conversion vers le format PNM + * + */ #include #include #include @@ -60,3 +64,4 @@ if (foo) fprintf(stderr, "conversion -> %d\n", foo); return 0; } +/* --------------------------------------------------------------------- */ diff --git a/tools/mkfimg.c b/tools/mkfimg.c index 7d006ad..697d996 100644 --- a/tools/mkfimg.c +++ b/tools/mkfimg.c @@ -20,14 +20,13 @@ if (4 != argc) { } fname = argv[1]; width = atoi(argv[2]); height = atoi(argv[3]); -fprintf(stderr, "making %s %d x %d\n", fname, width, height); +fprintf(stderr, "making '%s' %d x %d\n", fname, width, height); foo = fimg_create(&fimg, width, height, 3); if (foo) { fprintf(stderr, "create floatimg -> %d\n", foo); exit(1); } -// fimg_describe(&fimg, "just a black flimg"); fimg_clear(&fimg); foo = fimg_dump_to_file(&fimg, fname, 0);