Browse Source

minor fixes

master
tth 1 year ago
parent
commit
57af8c2e93
  1. 2
      floatimg.h
  2. 4
      funcs/Makefile
  3. 2
      funcs/fimg-png.c
  4. 2
      funcs/t.c
  5. 21
      funcs/tests.c
  6. 10
      funcs/vroum.sh

2
floatimg.h

@ -130,7 +130,7 @@ int fimg_mix_rgb_gray(FloatImg *img, float mix); @@ -130,7 +130,7 @@ int fimg_mix_rgb_gray(FloatImg *img, float mix);
int fimg_shift_to_zero(FloatImg *s, FloatImg *d, float coefs[6]);
/* --> funcs/plasmas.c */
int fimg_prototype_plasma(FloatImg *img, char *txt, int type);
int fimg_prototype_plasma(FloatImg *img, double time, int type);
/* * * * experimental ! */
int fimg_classif_trial(FloatImg *src, FloatImg*dst, float fval, int notused);

4
funcs/Makefile

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
#---------------------------------------------------------------
COPT = -Wall -fpic -g -no-pie -DDEBUG_LEVEL=1
COPT = -Wall -fpic -g -no-pie -DDEBUG_LEVEL=0
DEPS = ../floatimg.h Makefile
OBJS = fimg-png.o fimg-tiff.o misc-plots.o filtrage.o utils.o \
@ -29,7 +29,7 @@ tests.o: tests.c tests.h $(DEPS) @@ -29,7 +29,7 @@ tests.o: tests.c tests.h $(DEPS)
../libfloatimg.a: $(OBJS)
$(AR) r $@ $?
displacement.o: displacement.c
displacement.o: displacement.c $(DEPS)
gcc $(COPT) -c $<
fimg-png.o: fimg-png.c $(DEPS)

2
funcs/fimg-png.c

@ -170,7 +170,7 @@ unsigned char *bytes, *bptr; @@ -170,7 +170,7 @@ unsigned char *bytes, *bptr;
double maximum, fk;
#if DEBUG_LEVEL
fprintf(stderr, ">>> %-25s ( %p '%s' %x )\n", __func__, src, outname, flags);
fprintf(stderr, ">>> %-25s ( %p '%s' 0x%x )\n", __func__, src, outname, flags);
#endif
/* convert ou floating datas to a byte/rgb array */

2
funcs/t.c

@ -171,7 +171,7 @@ switch(opt) { @@ -171,7 +171,7 @@ switch(opt) {
foo = essai_lecture_png(filename, outfile, 0);
break;
case Plasmas:
foo = essai_plasma(filename, outfile, 1, 13.37);
foo = essai_plasma(filename, outfile, 1, global_fvalue);
fprintf(stderr, "we are all plasmafields\n");
break;
default:

21
funcs/tests.c

@ -17,6 +17,8 @@ @@ -17,6 +17,8 @@
extern int verbosity;
/* --------------------------------------------------------------------- */
/*
*/
int essai_plasma(char *infile, char *outfile, int ikoef, float fkoef)
{
FloatImg src, dst;
@ -27,15 +29,24 @@ fprintf(stderr, ">>> %s ( '%s' '%s' %d %g )\n", __func__, @@ -27,15 +29,24 @@ fprintf(stderr, ">>> %s ( '%s' '%s' %d %g )\n", __func__,
/* if infile is loadable, use it for background */
foo = fimg_create_from_dump(infile, &src);
if (foo) {
fprintf(stderr, "%s: error loading '%s'\n", __func__, infile);
return foo;
if (0 == foo) {
fprintf(stderr, "%s: image '%s' loaded\n", __func__, infile);
}
else {
/* make a fancy synthetic picture */
foo = fimg_create(&src, 800, 600, FIMG_TYPE_RGB);
}
fprintf(stderr, "'%s' loaded\n", infile);
fimg_printhead(&src);
fimg_printhead(&src);
fimg_clone(&src, &dst, 1);
foo = fimg_prototype_plasma(&dst, fkoef, 0);
if (foo) {
fprintf(stderr, "%s: err %d on plasma proto\n", __func__, foo);
return -88;
}
fimg_mul_3(&src, &dst, &dst);
foo = fimg_export_picture(&dst, outfile, 0);
if (foo) {

10
funcs/vroum.sh

@ -7,7 +7,7 @@ device=/dev/video2 @@ -7,7 +7,7 @@ device=/dev/video2
maxi=59
W="320"
H="240"
grabopt=" -s ${W}x${H}w -vv -d $device -p 0 -n 30
grabopt=" -s ${W}x${H} -vv -u -d $device -p 0 -n 30
0 -c none "
mkdir /tmp/V
@ -22,10 +22,10 @@ do @@ -22,10 +22,10 @@ do
grabvidseq -$grabopt -o $src
fval=$(echo "$foo / $maxi" | bc -l)
echo $foo ' => ' $fval
fval=$(echo "$foo / $maxi * 13.56636" | bc -l)
echo ; echo $foo ' => ' $fval
./t -vv -k $fval -o $out classif $src
./t -vv -k $fval -o $out plasma $src
# fimgstats $out
@ -33,7 +33,7 @@ do @@ -33,7 +33,7 @@ do
echo $dst
montage $src $out -tile 1x2 -geometry $G $dst
sleep 2
sleep 55
done

Loading…
Cancel
Save