tTh/FloatImg
2
2
Fork 1
Code Issues 2 Pull Requests Releases Wiki Activity

Compare commits

base: tTh:ed864ea45a12686a66a4afbc81e1d44b4d3db9a7
Branches Tags
tTh:master
..
compare: tTh:d4d2dcc7f50480e2f0e0f3d2952e84216517ae29
Branches Tags
tTh:master

3 Commits
ed864ea45a ... d4d2dcc7f5

Author SHA1 Message Date
tonton th
d4d2dcc7f5 pas grand chose... 2020-07-06 18:08:18 +02:00
tonton th
b39660cc78 fix a bug in rotate_90 2020-07-04 19:32:33 +02:00
tonton th
085387aba2 improve help message 2020-07-04 19:00:04 +02:00
3 changed files with 18 additions and 10 deletions
Show Stats Expand all files Collapse all files

2
floatimg.h
View File

@ -3,7 +3,7 @@
* ugly code from tTh * ugly code from tTh
*/ */
#define FIMG_VERSION 101 #define FIMG_VERSION 102
/* /*
* in memory descriptor * in memory descriptor

11
funcs/rotate.c
View File

@ -15,7 +15,7 @@ extern int verbosity;
int fimg_rotate_90(FloatImg *src, FloatImg *dst, int notused) int fimg_rotate_90(FloatImg *src, FloatImg *dst, int notused)
{ {
int foo; int foo;
int x, y; int x, y, j, k;
float rgb[3]; float rgb[3];
#if DEBUG_LEVEL #if DEBUG_LEVEL
@ -40,7 +40,7 @@ if ( 0 == (dst->type | dst->width | dst->height) ) {
fprintf(stderr, "%s: err %d create new pic\n", __func__, foo); fprintf(stderr, "%s: err %d create new pic\n", __func__, foo);
return -887; return -887;
} }
if (verbosity) fimg_describe(dst, "new pic"); // if (verbosity>1) fimg_describe(dst, "new pic");
} }
/* check if dst and src are conpatibles */ /* check if dst and src are conpatibles */
@ -56,7 +56,12 @@ if ( (src->type != dst->type) ||
for (y=0; y<src->height; y++) { for (y=0; y<src->height; y++) {
for (x=0; x<src->width; x++) { for (x=0; x<src->width; x++) {
fimg_get_rgb(src, x, y, rgb); fimg_get_rgb(src, x, y, rgb);
fimg_put_rgb(dst, y, x, rgb); j = (dst->height - x) - 1;
k = (dst->width - y) - 1;
#if DEBUG_LEVEL > 1
fprintf(stderr, "%6d %6d\n", k, j);
#endif
fimg_put_rgb(dst, k, x, rgb);
} }
} }

15
v4l2/grabvidseq.c
View File

@ -77,6 +77,7 @@ puts("\t-n NNN\t\thow many frames ?");
puts("\t-O ./\t\tset Output dir"); puts("\t-O ./\t\tset Output dir");
puts("\t-o bla.xxx\tset output filename"); puts("\t-o bla.xxx\tset output filename");
puts("\t-p NN.N\t\tperiod in seconds"); puts("\t-p NN.N\t\tperiod in seconds");
puts("\t-r NNN\t\trotate picture");
puts("\t-s WxH\t\tsize of capture"); puts("\t-s WxH\t\tsize of capture");
puts("\t-c mode\t\tcontrast enhancement"); puts("\t-c mode\t\tcontrast enhancement");
puts("\t-u\t\ttry upscaling..."); puts("\t-u\t\ttry upscaling...");
@ -157,8 +158,9 @@ while ((opt = getopt(argc, argv, "c:d:ghn:o:O:p:r:s:uv")) != -1) {
} }
if (verbosity > 1) { if (verbosity > 1) {
fprintf(stderr, "GrabVidSeq (%s, %s) pid=%d\n", __DATE__, __TIME__, getpid()); fprintf(stderr, "*** GrabVidSeq (%s, %s) pid=%d\n",
fprintf(stderr, "grabing %d picz\n", nbre_capt); __DATE__, __TIME__, getpid());
fprintf(stderr, "grabing %d picz, ", nbre_capt);
fprintf(stderr, "period is %.3f milliseconds\n", period/1e3); fprintf(stderr, "period is %.3f milliseconds\n", period/1e3);
fprintf(stderr, "framesize is %dx%d\n", width, height); fprintf(stderr, "framesize is %dx%d\n", width, height);
fprintf(stderr, "destdir is '%s'\n", dest_dir); fprintf(stderr, "destdir is '%s'\n", dest_dir);
@ -368,10 +370,11 @@ switch (contrast) {
} }
/* XXX warning, new from coronahome 26 mars 2020 */ /* XXX warning, new from coronahome 26 mars 2020 */
to_save = &cumul;
if (90 == rotfactor) { if (90 == rotfactor) {
memset(&tmpfimg, 0, sizeof(FloatImg)); memset(&tmpfimg, 0, sizeof(FloatImg));
foo = fimg_rotate_90(&cumul, &tmpfimg, 0); foo = fimg_rotate_90(&cumul, &tmpfimg, 0);
if (verbosity > 1) { if (verbosity > 2) {
fprintf(stderr, "dump rot90 %p\n", &tmpfimg); fprintf(stderr, "dump rot90 %p\n", &tmpfimg);
foo = fimg_save_as_png(&tmpfimg, "rot90.png", 0); foo = fimg_save_as_png(&tmpfimg, "rot90.png", 0);
} }
@ -382,13 +385,13 @@ if (90 == rotfactor) {
foo = format_from_extension(outfile); foo = format_from_extension(outfile);
switch (foo) { switch (foo) {
case FILE_TYPE_FIMG: case FILE_TYPE_FIMG:
foo = fimg_dump_to_file(&cumul, outfile, 0); foo = fimg_dump_to_file(to_save, outfile, 0);
break; break;
case FILE_TYPE_PNM: case FILE_TYPE_PNM:
foo = fimg_save_as_pnm(&cumul, outfile, 1); foo = fimg_save_as_pnm(to_save, outfile, 1);
break; break;
case FILE_TYPE_PNG: case FILE_TYPE_PNG:
foo = fimg_save_as_png(&cumul, outfile, 0); foo = fimg_save_as_png(to_save, outfile, 0);
break; break;
default: default:
fprintf(stderr, "can't save as %s\n", outfile); fprintf(stderr, "can't save as %s\n", outfile);