Compare commits

..

No commits in common. "334cffce6055a1e4b4583240d3eea85889db6357" and "3849485c02751647faeff5695b8c4df6055c2388" have entirely different histories.

5 changed files with 6 additions and 12 deletions

1
.gitignore vendored
View File

@ -40,7 +40,6 @@ v4l2/grabvidseq
v4l2/*.o
v4l2/*.ppm
v4l2/*.png
v4l2/*.fits
v4l2/video-infos
v4l2/nc-camcontrol

View File

@ -51,9 +51,8 @@ for (x=0; x<fimg->width; x++) {
val = ((double)x / (double)fimg->width) * dval;
for (y=0; y<20; y++) {
fimg_plot_rgb(fimg, x, k+y, val, val, val);
fimg_plot_rgb(fimg, x, k+y+20, dval-val, dval-val, dval-val);
fimg_plot_rgb(fimg, x, k+y+20, 1-val, 1-val, 1-val);
}
// fprintf(stderr, " %6d %f\n", x, val);
}

View File

@ -19,8 +19,7 @@ v4l2_pr_structs.o: v4l2_pr_structs.c v4l2_pr_structs.h Makefile
gcc ${COPT} -c $<
grabvidseq: grabvidseq.c ${DEPS} rgb2fimg.o
gcc ${COPT} $< rgb2fimg.o ../libfloatimg.a -lpnglite -lz -lm \
-lcfitsio -lv4l2 -o $@
gcc ${COPT} $< rgb2fimg.o ../libfloatimg.a -lpnglite -lz -lm -lv4l2 -o $@
video-infos: video-infos.c Makefile funcs.o v4l2_pr_structs.o
gcc -Wall -g $< ${LOBJ} ../libfloatimg.a -o $@

View File

@ -51,9 +51,9 @@ int verbosity;
static void xioctl(int fh, int request, void *arg)
{
int r;
int r;
do {
do {
r = v4l2_ioctl(fh, request, arg);
} while (r == -1 && ((errno == EINTR) || (errno == EAGAIN)));
@ -393,9 +393,6 @@ switch (foo) {
case FILE_TYPE_PNG:
foo = fimg_save_as_png(to_save, outfile, 0);
break;
case FILE_TYPE_FITS:
foo = fimg_save_R_as_fits(to_save, outfile, 0);
break;
default:
fprintf(stderr, "can't save as %s\n", outfile);
break;

View File

@ -22,9 +22,9 @@ int verbosity;
/* --------------------------------------------------------------------- */
int essai_get_fmt(char *dev, int k)
{
int vfd, foo;
int vfd, idx, foo;
struct v4l2_format fmt;
// struct v4l2_requestbuffers reqbuf;
struct v4l2_requestbuffers reqbuf;
fprintf(stderr, ">>> %s ( '%s' %d )\n", __func__, dev, k);