From a4b7f5c21c8166a84fe7e99f00eea055dc6a2758 Mon Sep 17 00:00:00 2001 From: tTh Date: Mon, 13 Feb 2023 17:56:08 +0100 Subject: [PATCH] nap time commit --- Fonderie/Makefile | 8 ++++---- Fonderie/craplist2str.awk | 2 +- Fonderie/glitches.c | 3 --- contrib/do_eff_spass.sh | 33 +++++++++++++++------------------ floatimg.h | 2 +- funcs/decomprgb.c | 6 ++++++ funcs/pixelize.c | 2 +- v4l2/README.md | 9 +++++++++ 8 files changed, 37 insertions(+), 28 deletions(-) diff --git a/Fonderie/Makefile b/Fonderie/Makefile index da61066f..43e909f7 100644 --- a/Fonderie/Makefile +++ b/Fonderie/Makefile @@ -41,19 +41,19 @@ singlepass: singlepass.c ${DEPS} ${OBJS} Makefile # some files are magically generated, sorry. # crapdef.h: crapulors.liste Makefile craplist2h.awk - ./craplist2h.awk < $< | tee $@ + < $< ./craplist2h.awk > $@ crapstr.h: crapulors.liste Makefile craplist2str.awk - ./craplist2str.awk < $< | tee $@ + < $< ./craplist2str.awk > $@ # --------------------------------------------------------- # # a lot of silly functions # -crapulator.o: crapulator.c ${DEPS} Makefile +crapulator.o: crapulator.c $(DEPS) Makefile gcc ${COPT} -c $< -fifo.o: fifo.c fifo.h Makefile +fifo.o: fifo.c fifo.h $(DEPS) Makefile gcc ${COPT} -c $< sfx.o: sfx.c ${DEPS} Makefile diff --git a/Fonderie/craplist2str.awk b/Fonderie/craplist2str.awk index 47f30715..25079468 100755 --- a/Fonderie/craplist2str.awk +++ b/Fonderie/craplist2str.awk @@ -24,5 +24,5 @@ BEGIN { END { print " { -1, NULL }" print " };" - print "// generated file, do not edit by hand !" + print "// ! generated file, do not edit by hand !" } diff --git a/Fonderie/glitches.c b/Fonderie/glitches.c index d7342751..dfec371f 100644 --- a/Fonderie/glitches.c +++ b/Fonderie/glitches.c @@ -151,13 +151,11 @@ int pass, szimg, osrc, odst; szimg = picture->width * picture->height; for (pass=0; passR[odst] = (picture->R[osrc] + picture->R[odst]) / 2.0; picture->G[odst] = (picture->G[osrc] + picture->G[odst]) / 2.0; picture->B[odst] = (picture->B[osrc] + picture->B[odst]) / 2.0; - } return 0; @@ -180,7 +178,6 @@ for (y=0; yheight; y+=16) { un_petit_flou_8x8(picture, x, y+8); un_petit_flou_8x8(picture, x+8, y+8); } - } } diff --git a/contrib/do_eff_spass.sh b/contrib/do_eff_spass.sh index 4902026c..d22edd49 100755 --- a/contrib/do_eff_spass.sh +++ b/contrib/do_eff_spass.sh @@ -22,19 +22,17 @@ do_an_effect_pass() { local effect=$1 local ddir=$2 -figlet "$effect" ; echo +figlet "$effect" ; echo echo " ===> " $ddir -ls $ddir | wc rm -f $ddir/?????.png -ls $ddir | wc $SPASS -F $effect \ -g $SRCDIR/'?????.fimg' \ -O $ddir \ - -r 2 -ls $ddir | wc + -r 1 + } # -------------------------------------------- @@ -47,6 +45,17 @@ local sdir=$2 echo "====== Linkfarming from " $sdir \ "====== avec" $(ls $sdir | wc -l) "images" +mogrify \ + -font Utopia-Bold \ + -pointsize 90 \ + -kerning 9 \ + -fill Gray80 \ + -stroke Gray20 \ + -strokewidth 3 \ + -gravity South-East \ + -annotate +45+125 $effname \ + $sdir/*.png + for img in $(ls -1 $sdir/?????.png) do @@ -54,16 +63,6 @@ do # echo "image = " $img # echo "link = " $linkname - mogrify \ - -font Noto-Serif-Bold \ - -pointsize 70 \ - -kerning 4 \ - -fill Gray90 \ - -stroke Gray10 \ - -strokewidth 3 \ - -annotate +35+85 $effname \ - $img - ln --force --symbolic $img $linkname LINKNUM=$(( LINKNUM + 1 )) @@ -75,7 +74,7 @@ echo "linkfarming done" do_all_the_effects() { -EFFECTS=$( $SPASS -L | sort ) +EFFECTS=$( $SPASS -L | sort --reverse ) for effect in $EFFECTS do @@ -99,8 +98,6 @@ done rm -v -f $LINKFARM/L?????.png - - do_all_the_effects banner encoding diff --git a/floatimg.h b/floatimg.h index c1859982..d4a80130 100644 --- a/floatimg.h +++ b/floatimg.h @@ -20,7 +20,7 @@ * https://git.tetalab.org/tTh/FloatImg */ -#define FIMG_VERSION (219) +#define FIMG_VERSION (220) #define RELEASE_NAME ("noname") /* XXX add a test for stdint.h / uint32_t XXX */ diff --git a/funcs/decomprgb.c b/funcs/decomprgb.c index 1288a02a..c6829ab3 100644 --- a/funcs/decomprgb.c +++ b/funcs/decomprgb.c @@ -44,6 +44,9 @@ fprintf(stderr, ">>> %s ( %p %p %d )\n", __func__, psrc, pdst, k); #endif +/* + * XXX useless message ? + */ if (k) { fprintf(stderr, "k=%d in %s\n", k, __func__); } fimg_clear(pdst); @@ -102,6 +105,9 @@ fprintf(stderr, ">>> %s ( %p %p %d )\n", __func__, psrc, pdst, k); #endif +/* + * XXX useless message ? + */ if (k) { fprintf(stderr, "k=%d in %s\n", k, __func__); } fimg_clear(pdst); diff --git a/funcs/pixelize.c b/funcs/pixelize.c index 4d81d93b..f1e8e837 100644 --- a/funcs/pixelize.c +++ b/funcs/pixelize.c @@ -32,7 +32,7 @@ switch(largeur) { case 8: case 16: case 32: break; default: - fprintf(stderr, "%s bad width %d\n", __func__, largeur); + fprintf(stderr, "%s: bad width %d\n", __func__, largeur); return -77; } diff --git a/v4l2/README.md b/v4l2/README.md index 21d28dd7..1171d084 100644 --- a/v4l2/README.md +++ b/v4l2/README.md @@ -1,7 +1,12 @@ # Images en virgule flottante, video 4 linux +Quelques gruikwares en rapport avec la capture vidéo. + + ## grabvidseq +Logiciel de capture d'une image flottante par accumulation de trames. + ``` tth@lubitel:~/Devel/FloatImg/v4l2$ ./grabvidseq -h options : @@ -18,6 +23,10 @@ options : -v increase verbosity ``` +Les formats d'exportation sont : Fimg, Png, Tiff, Pnm et Fits. Chacun d'eux +ayant son propre lot de limitations et de bugs. Le choix est fait +selon l'extension du nom de fichier demandé~: ".fimg", ".tiff"... + ## video-infos ```