Compare commits

..

2 Commits

Author SHA1 Message Date
tth
29fff3c578 useless comments 2019-12-21 12:37:26 +01:00
tth
3712ef9efe no exit on errors 2019-12-21 12:35:52 +01:00
3 changed files with 16 additions and 5 deletions

View File

@ -117,7 +117,7 @@ if (NULL==(fp = fopen(fname, "r"))) {
} }
foo = fread(&filehead, sizeof(FimgFileHead), 1, fp); foo = fread(&filehead, sizeof(FimgFileHead), 1, fp);
if (1 != foo) { if (1 != foo) {
fprintf(stderr, "%s : short read\n", fname); fprintf(stderr, "%s: short read on '%s'\n", __func__, fname);
fclose(fp); fclose(fp);
return -1; return -1;
} }
@ -127,15 +127,17 @@ if ( (filehead.w != where->width) ||
(filehead.h != where->height) || (filehead.h != where->height) ||
(filehead.t != where->type) ) { (filehead.t != where->type) ) {
fprintf(stderr, "file '%s' incompatible\n", fname); fprintf(stderr, "%s: file '%s' incompatible\n", __func__, fname);
exit(3); fclose(fp);
return -17;
} }
nbre = filehead.w*filehead.h*filehead.t; /* ugly quirk */ nbre = filehead.w*filehead.h*filehead.t; /* ugly quirk */
foo = fread(where->R, sizeof(float), nbre, fp); foo = fread(where->R, sizeof(float), nbre, fp);
if (nbre != foo) { if (nbre != foo) {
fprintf(stderr, "err read '%s' : %d\n", fname, errno); fprintf(stderr, "%s: err read '%s' : %d\n", __func__, fname, errno);
exit(3); fclose(fp);
return -18;
} }
fclose(fp); fclose(fp);

View File

@ -15,6 +15,10 @@
extern int verbosity; /* must be declared around main() */ extern int verbosity; /* must be declared around main() */
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
/*
* A + B -> D
* why is this func so slow ?
*/
int fimg_add(FloatImg *a, FloatImg *b, FloatImg *d) int fimg_add(FloatImg *a, FloatImg *b, FloatImg *d)
{ {
int idx, nbiter; int idx, nbiter;
@ -57,6 +61,9 @@ if (3 != a->type || 3 != b->type || 3 != d->type) {
nbiter = a->width * a->height; nbiter = a->width * a->height;
/* maybe we can speedup this loop for
* avoiding the cache strashing ?
*/
for (idx=0; idx<nbiter; idx++) { for (idx=0; idx<nbiter; idx++) {
d->R[idx] = fabs(a->R[idx] - b->R[idx]); d->R[idx] = fabs(a->R[idx] - b->R[idx]);
d->G[idx] = fabs(a->G[idx] - b->G[idx]); d->G[idx] = fabs(a->G[idx] - b->G[idx]);

View File

@ -41,6 +41,8 @@ for (y=0; y<h; y++) {
r = (float)*src++; r = (float)*src++;
g = (float)*src++; g = (float)*src++;
b = (float)*src++; b = (float)*src++;
/* may be, here, we can speed up the job */
fimg_add_rgb(d, xx, yy, r, g, b); fimg_add_rgb(d, xx, yy, r, g, b);
} }
} }