diff --git a/tools/addpnm2fimg.c b/tools/addpnm2fimg.c index 510c4a7..03bcb39 100644 --- a/tools/addpnm2fimg.c +++ b/tools/addpnm2fimg.c @@ -29,7 +29,7 @@ fimg_describe(&dst, "created fimg from dump"); foo = fimg_load_from_pnm(srcname, &src, 0); if (foo) fprintf(stderr, "create src fimg from '%s' -> %d\n", dstname, foo); #if DEBUG_LEVEL -fimg_describe(&qrc, "created fimg from PNM"); +fimg_describe(&src, "created fimg from PNM"); #endif // fprintf(stderr, "src is %dx%d\n", src.width, src.height); diff --git a/tools/cumulfimgs.c b/tools/cumulfimgs.c index 5ac8c36..500dce6 100644 --- a/tools/cumulfimgs.c +++ b/tools/cumulfimgs.c @@ -5,30 +5,85 @@ #include "../floatimg.h" int verbosity; + +int g_width, g_height; + +/* --------------------------------------------------------------------- */ +int testfile(char *path) +{ +int foo, numbers[3]; + +foo = fimg_fileinfos(path, numbers); +if (foo) { +#if DEBUG_LEVEL + fprintf(stderr, "%s -> err %d\n", path, foo); +#endif + return foo; + } + +fprintf(stderr, "\t\t%d x %d\n",numbers[0], numbers[1]); + +if (3 != numbers[2]) { + fprintf(stderr, "file %s, %d : bad type\n", path, numbers[2]); + return -7; + } + + + +return foo; +} /* --------------------------------------------------------------------- */ void help(int v) { puts("options :"); puts("\t-v\tincrease verbosity"); puts("\t-o\tname of output file"); +puts("\t-s\tname of source file"); if (verbosity) { puts(""); fimg_print_version(1); } } /* --------------------------------------------------------------------- */ int main(int argc, char *argv[]) { -int foo; +int foo, idx; int opt; char *output_file = "noname.fimg"; +char *source_file = "noname.fimg"; -while ((opt = getopt(argc, argv, "ho:v")) != -1) { + +g_width = g_height = 0; + +while ((opt = getopt(argc, argv, "ho:s:v")) != -1) { switch(opt) { case 'h': help(0); break; case 'o': output_file = optarg; break; + case 's': source_file = optarg; break; case 'v': verbosity++; break; } } +#if DEBUG_LEVEL +fprintf(stderr, "argc = %d, optind = %d\n", argc, optind); +#endif + + +foo = testfile(source_file); +fprintf(stderr, "Source %s -> %d\n", source_file, foo); + +foo = testfile(output_file); +fprintf(stderr, "Output %s -> %d\n", output_file, foo); + + + +for (idx=optind; idx %d\n", argv[idx],foo); + + } + return 0; } /* --------------------------------------------------------------------- */ diff --git a/tools/fimgstats.c b/tools/fimgstats.c index 96cb4d3..14ab9b5 100644 --- a/tools/fimgstats.c +++ b/tools/fimgstats.c @@ -85,7 +85,9 @@ if (argc == 1) { } foo = various_numbers_from_file(argv[optind], 0); - +if (foo) { + fprintf(stderr, "got a %d ?\n", foo); + } return 0; } /* --------------------------------------------------------------------- */ diff --git a/tools/mkfimg.c b/tools/mkfimg.c index 697d996..5c03df8 100644 --- a/tools/mkfimg.c +++ b/tools/mkfimg.c @@ -4,22 +4,38 @@ #include "../floatimg.h" -/* --------------------------------------------------------------------- */ +int verbosity; +/* --------------------------------------------------------------------- */ +void help(int lj) +{ +fimg_print_version(1); + +exit(0); +} +/* --------------------------------------------------------------------- */ int main(int argc, char *argv[]) { -int foo; +int foo, opt; int width, height; char *fname; FloatImg fimg; +while ((opt = getopt(argc, argv, "ho:v")) != -1) { + switch(opt) { + case 'h': help(0); break; + case 'v': verbosity++; break; + } + } + if (4 != argc) { fimg_print_version(1); fprintf(stderr, "Usage:\n\t%s quux.fimg width height\n", argv[0]); exit(1); } -fname = argv[1]; -width = atoi(argv[2]); height = atoi(argv[3]); + +fname = argv[optind]; +width = atoi(argv[optind+1]); height = atoi(argv[optind+2]); fprintf(stderr, "making '%s' %d x %d\n", fname, width, height); foo = fimg_create(&fimg, width, height, 3); @@ -31,7 +47,7 @@ fimg_clear(&fimg); foo = fimg_dump_to_file(&fimg, fname, 0); if (foo) { - fprintf(stderr, "dump floatimg -> %d\n", foo); + fprintf(stderr, "dump fimg -> %d\n", foo); exit(1); }