Compare commits
No commits in common. "b0fe0091d496a162e9053af8a11fc125e04c3a5c" and "c3bc39750d229be061411dca5a9ae621f7f4f03e" have entirely different histories.
b0fe0091d4
...
c3bc39750d
@ -58,7 +58,7 @@ int fimg_sub(FloatImg *a, FloatImg *b, FloatImg *d);
|
||||
int fimg_mul(FloatImg *a, FloatImg *b, FloatImg *d);
|
||||
|
||||
/* 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);
|
||||
|
||||
double fimg_timer_set(int whot);
|
||||
|
@ -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;
|
||||
float maximum, fk;
|
||||
char *code;
|
||||
|
||||
#if DEBUG_LEVEL
|
||||
fprintf(stderr, ">>> %-25s ( %p '%s' 0x%04x )\n", __func__, head,
|
||||
fname, flags);
|
||||
fprintf(stderr, ">>> %-25s ( %p '%s' %d )\n", __func__, head,
|
||||
fname, notused);
|
||||
#endif
|
||||
|
||||
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);
|
||||
|
||||
if ( flags & 1 ) {
|
||||
fprintf(stderr, "%s using fval/count %f %d -> %f\n", __func__,
|
||||
head->fval, head->count,
|
||||
head->fval * head->count);
|
||||
fk = (head->fval * head->count) / 65535.0;
|
||||
}
|
||||
else {
|
||||
maximum = fimg_get_maxvalue(head);
|
||||
fprintf(fp, "# maxval %15f\n", maximum);
|
||||
fk = maximum / 65535.0;
|
||||
fprintf(fp, "# maxval %15f\n# divisor %15f\n", maximum, fk);
|
||||
}
|
||||
|
||||
fprintf(fp, "# divisor %15f\n", fk);
|
||||
fprintf(fp, "65535\n");
|
||||
fflush(fp);
|
||||
|
||||
|
@ -129,7 +129,6 @@ while ((opt = getopt(argc, argv, "d:ghn:o:O:p:s:uv")) != -1) {
|
||||
optarg);
|
||||
exit(1);
|
||||
}
|
||||
period *= 1e6;
|
||||
break;
|
||||
case 's': parse_WxH(optarg, &width, &height);
|
||||
break;
|
||||
@ -142,7 +141,6 @@ if (verbosity) {
|
||||
fprintf(stderr, "running %s pid=%d\n", argv[0], getpid());
|
||||
fprintf(stderr, "period is %.3f milliseconds\n", period/1e3);
|
||||
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);
|
||||
@ -313,7 +311,7 @@ if (to_gray) {
|
||||
|
||||
// save cumul to file
|
||||
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
|
||||
fimg_destroy(&cumul);
|
||||
|
Loading…
Reference in New Issue
Block a user