tryint that thing for the ravebish

This commit is contained in:
Tonton Th 2019-06-29 23:50:03 +02:00
parent ea70dd78f6
commit c7d7c8b2dd
5 changed files with 130 additions and 1 deletions

1
.gitignore vendored
View File

@ -1,5 +1,6 @@
lib/*.o lib/*.o
lib/t
funcs/*.o funcs/*.o
*.a *.a

27
lib/t.c Normal file
View File

@ -0,0 +1,27 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include "string.h"
#include "../floatimg.h"
int verbosity;
int main(int argc, char *argv[])
{
int foo;
FloatImg fimg;
verbosity = 1;
foo = fimg_load_from_pnm("/tmp/00000.ppm", &fimg, 0);
printf("retour du truc %d\n", foo);
fimg_printhead(&fimg);
fimg_save_as_pnm(&fimg, "foo.pnm", 0);
return 0;
}

View File

@ -8,7 +8,8 @@ DEPS = ../floatimg.h ../libfloatimg.a Makefile
# ---------- # ----------
all: fimg2pnm addtga2fimg mkfimg png2fimg fimgstats fimg2png all: fimg2pnm addtga2fimg mkfimg png2fimg fimgstats fimg2png \
addpnm2fimg
fimgstats: fimgstats.c $(DEPS) fimgstats: fimgstats.c $(DEPS)
gcc -g $< ../libfloatimg.a -o $@ gcc -g $< ../libfloatimg.a -o $@
@ -25,6 +26,10 @@ fimg2png: fimg2png.c $(DEPS)
addtga2fimg: addtga2fimg.c $(DEPS) addtga2fimg: addtga2fimg.c $(DEPS)
gcc -g $< ../libfloatimg.a -limageSO -lm -o $@ gcc -g $< ../libfloatimg.a -limageSO -lm -o $@
addpnm2fimg: addpnm2fimg.c $(DEPS)
gcc -g $< ../libfloatimg.a -limageSO -lm -o $@
# if "undefined reference to crc32" then "use -lz" # if "undefined reference to crc32" then "use -lz"
png2fimg: png2fimg.c $(DEPS) png2fimg: png2fimg.c $(DEPS)
gcc -g $< ../libfloatimg.a -lpnglite -o $@ gcc -g $< ../libfloatimg.a -lpnglite -o $@

94
tools/addpnm2fimg.c Normal file
View File

@ -0,0 +1,94 @@
/*
* ADDPNM
*/
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include "../floatimg.h"
int verbosity;
/* --------------------------------------------------------------------- */
int add_pnm_to_fimg(char *srcname, char *dstname, int notused)
{
FloatImg dst, src;
int foo, x, y, idx;
#if DEBUG_LEVEL
fprintf(stderr, ">>> %s ( '%s' %s' )\n", __func__, srcname, dstname);
#endif
foo = fimg_create_from_dump(dstname, &dst);
if (foo) fprintf(stderr, "create dst fimg from '%s' -> %d\n", dstname, foo);
#if DEBUG_LEVEL
fimg_describe(&dst, "created fimg from dump");
#endif
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");
#endif
idx = 0;
for (y=0; y<src.height; y++) {
for (x=0; x<src.width; x++) {
dst.R[idx] += src.R[idx];
dst.G[idx] += src.G[idx];
dst.B[idx] += src.B[idx];
}
}
foo = fimg_dump_to_file(&dst, dstname, 0);
if (foo) { fprintf(stderr, "fimg dump -> %d\n", foo); }
return 0;
}
/* --------------------------------------------------------------------- */
int main(int argc, char *argv[])
{
int foo;
// int srcW, srcH;
int infos[3];
if (3 != argc) {
fimg_print_version(1);
fprintf(stderr, "usage:\n\t%s img.fimg cumul.fimg\n", argv[0]);
exit(1);
}
if ( 0==access(argv[2], R_OK|W_OK) ) { /* fimg is readable */
fprintf(stderr, "%s exist\n", argv[2]);
}
/*
else {
fprintf(stderr, "*** must create '%s' %dx%d first !!!\n",
argv[2], tgaW, tgaH);
exit(1);
} */
foo = fimg_fileinfos(argv[2], infos);
// fprintf(stderr, "get dims of '%s' -> %d\n", argv[2], foo);
if (foo) {
fprintf(stderr, "*** %s is badly broken\n", argv[2]);
exit(2);
}
/*
if ( (tgaW != infos[0]) || (tgaW != infos[0]) ) {
fprintf(stderr, " TGA %5d %5d\n", tgaW, tgaH);
fprintf(stderr, " FIMG %5d %5d\n", infos[0], infos[1]);
fprintf(stderr, " No dimension match.\n");
exit(3);
}
*/
foo = add_pnm_to_fimg(argv[1], argv[2], 0);
return 0;
}
/* --------------------------------------------------------------------- */

View File

@ -9,6 +9,8 @@
#include "../floatimg.h" #include "../floatimg.h"
int verbosity = 0;
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {