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

Compare commits

base: tTh:b0fe0091d496a162e9053af8a11fc125e04c3a5c
Branches Tags
tTh:master
..
compare: tTh:c3bc39750d229be061411dca5a9ae621f7f4f03e
Branches Tags
tTh:master

No commits in common. "b0fe0091d496a162e9053af8a11fc125e04c3a5c" and "c3bc39750d229be061411dca5a9ae621f7f4f03e" have entirely different histories.
b0fe0091d4 ... c3bc39750d

3 changed files with 10 additions and 20 deletions
Show Stats Expand all files Collapse all files

2
floatimg.h
View File

@ -58,7 +58,7 @@ int fimg_sub(FloatImg *a, FloatImg *b, FloatImg *d);
int fimg_mul(FloatImg *a, FloatImg *b, FloatImg *d); int fimg_mul(FloatImg *a, FloatImg *b, FloatImg *d);
/* PNM files module */ /* PNM files module */
int fimg_save_as_pnm(FloatImg *head, char *fname, int flags); int fimg_save_as_pnm(FloatImg *head, char *fname, int notused);
int fimg_load_from_pnm(char *fname, FloatImg *head, int notused); int fimg_load_from_pnm(char *fname, FloatImg *head, int notused);
double fimg_timer_set(int whot); double fimg_timer_set(int whot);

24
lib/fimg-pnm.c
View File

@ -131,17 +131,17 @@ fputs("\n", fp);
} }
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
/* /*
* bit 0 of flags : use fvalue/count *
*/ */
int fimg_save_as_pnm(FloatImg *head, char *fname, int flags) int fimg_save_as_pnm(FloatImg *head, char *fname, int notused)
{ {
FILE *fp; FILE *fp;
float maximum, fk; float maximum, fk;
char *code; char *code;
#if DEBUG_LEVEL #if DEBUG_LEVEL
fprintf(stderr, ">>> %-25s ( %p '%s' 0x%04x )\n", __func__, head, fprintf(stderr, ">>> %-25s ( %p '%s' %d )\n", __func__, head,
fname, flags); fname, notused);
#endif #endif
if ( head->type != FIMG_TYPE_RGB && head->type != FIMG_TYPE_GRAY) { if ( head->type != FIMG_TYPE_RGB && head->type != FIMG_TYPE_GRAY) {
@ -163,18 +163,10 @@ switch(head->type) {
fprintf(fp, "%s\n%d %d\n", code, head->width, head->height); fprintf(fp, "%s\n%d %d\n", code, head->width, head->height);
if ( flags & 1 ) { maximum = fimg_get_maxvalue(head);
fprintf(stderr, "%s using fval/count %f %d -> %f\n", __func__, fprintf(fp, "# maxval %15f\n", maximum);
head->fval, head->count, fk = maximum / 65535.0;
head->fval * head->count); fprintf(fp, "# divisor %15f\n", fk);
fk = (head->fval * head->count) / 65535.0;
}
else {
maximum = fimg_get_maxvalue(head);
fk = maximum / 65535.0;
fprintf(fp, "# maxval %15f\n# divisor %15f\n", maximum, fk);
}
fprintf(fp, "65535\n"); fprintf(fp, "65535\n");
fflush(fp); fflush(fp);

4
v4l2/grabvidseq.c
View File

@ -129,7 +129,6 @@ while ((opt = getopt(argc, argv, "d:ghn:o:O:p:s:uv")) != -1) {
optarg); optarg);
exit(1); exit(1);
} }
period *= 1e6;
break; break;
case 's': parse_WxH(optarg, &width, &height); case 's': parse_WxH(optarg, &width, &height);
break; break;
@ -142,7 +141,6 @@ if (verbosity) {
fprintf(stderr, "running %s pid=%d\n", argv[0], getpid()); fprintf(stderr, "running %s pid=%d\n", argv[0], getpid());
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, "upscaling is %s\n", upscaling ? "on" : "off");
} }
fd = v4l2_open(dev_name, O_RDWR | O_NONBLOCK, 0); fd = v4l2_open(dev_name, O_RDWR | O_NONBLOCK, 0);
@ -313,7 +311,7 @@ if (to_gray) {
// save cumul to file // save cumul to file
if (verbosity) fprintf(stderr, "saving to '%s'\n", outfile); if (verbosity) fprintf(stderr, "saving to '%s'\n", outfile);
foo = fimg_save_as_pnm(&cumul, outfile, 1); foo = fimg_save_as_pnm(&cumul, outfile, 0);
// free buffers // free buffers
fimg_destroy(&cumul); fimg_destroy(&cumul);