5 |
|
* General matrix operations. |
6 |
|
*/ |
7 |
|
|
8 |
– |
#include <stdio.h> |
8 |
|
#include <stdlib.h> |
9 |
< |
#include <string.h> |
10 |
< |
#include <fcntl.h> |
9 |
> |
#include <errno.h> |
10 |
> |
#include "rtio.h" |
11 |
> |
#include "platform.h" |
12 |
|
#include "resolu.h" |
13 |
+ |
#include "paths.h" |
14 |
|
#include "rmatrix.h" |
15 |
|
|
16 |
< |
typedef struct { |
16 |
< |
int nrows, ncols, ncomp; |
17 |
< |
int dtype; |
18 |
< |
} DMINFO; |
16 |
> |
static char rmx_mismatch_warn[] = "WARNING: data type mismatch\n"; |
17 |
|
|
18 |
|
/* Allocate a nr x nc matrix with n components */ |
19 |
|
RMATRIX * |
25 |
|
return(NULL); |
26 |
|
dnew = (RMATRIX *)malloc(sizeof(RMATRIX)-sizeof(dnew->mtx) + |
27 |
|
sizeof(dnew->mtx[0])*(n*nr*nc)); |
28 |
< |
if (dnew == NULL) |
28 |
> |
if (!dnew) |
29 |
|
return(NULL); |
30 |
|
dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n; |
31 |
+ |
dnew->dtype = DTdouble; |
32 |
+ |
dnew->swapin = 0; |
33 |
+ |
dnew->info = NULL; |
34 |
|
return(dnew); |
35 |
|
} |
36 |
|
|
37 |
+ |
/* Free a RMATRIX array */ |
38 |
+ |
void |
39 |
+ |
rmx_free(RMATRIX *rm) |
40 |
+ |
{ |
41 |
+ |
if (!rm) return; |
42 |
+ |
if (rm->info) |
43 |
+ |
free(rm->info); |
44 |
+ |
free(rm); |
45 |
+ |
} |
46 |
+ |
|
47 |
+ |
/* Resolve data type based on two input types (returns 0 for mismatch) */ |
48 |
+ |
int |
49 |
+ |
rmx_newtype(int dtyp1, int dtyp2) |
50 |
+ |
{ |
51 |
+ |
if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) | |
52 |
+ |
(dtyp2==DTxyze) | (dtyp2==DTrgbe) |
53 |
+ |
&& dtyp1 != dtyp2) |
54 |
+ |
return(0); |
55 |
+ |
if (dtyp1 < dtyp2) |
56 |
+ |
return(dtyp1); |
57 |
+ |
return(dtyp2); |
58 |
+ |
} |
59 |
+ |
|
60 |
+ |
/* Append header information associated with matrix data */ |
61 |
+ |
int |
62 |
+ |
rmx_addinfo(RMATRIX *rm, const char *info) |
63 |
+ |
{ |
64 |
+ |
if (!rm || !info || !*info) |
65 |
+ |
return(0); |
66 |
+ |
if (!rm->info) { |
67 |
+ |
rm->info = (char *)malloc(strlen(info)+1); |
68 |
+ |
if (rm->info) rm->info[0] = '\0'; |
69 |
+ |
} else |
70 |
+ |
rm->info = (char *)realloc(rm->info, |
71 |
+ |
strlen(rm->info)+strlen(info)+1); |
72 |
+ |
if (!rm->info) |
73 |
+ |
return(0); |
74 |
+ |
strcat(rm->info, info); |
75 |
+ |
return(1); |
76 |
+ |
} |
77 |
+ |
|
78 |
|
static int |
79 |
|
get_dminfo(char *s, void *p) |
80 |
|
{ |
81 |
< |
DMINFO *ip = (DMINFO *)p; |
82 |
< |
char fmt[32]; |
81 |
> |
RMATRIX *ip = (RMATRIX *)p; |
82 |
> |
char fmt[MAXFMTLEN]; |
83 |
|
int i; |
84 |
|
|
85 |
+ |
if (headidval(fmt, s)) |
86 |
+ |
return(0); |
87 |
|
if (!strncmp(s, "NCOMP=", 6)) { |
88 |
|
ip->ncomp = atoi(s+6); |
89 |
|
return(0); |
96 |
|
ip->ncols = atoi(s+6); |
97 |
|
return(0); |
98 |
|
} |
99 |
< |
if (!formatval(fmt, s)) |
99 |
> |
if ((i = isbigendian(s)) >= 0) { |
100 |
> |
ip->swapin = (nativebigendian() != i); |
101 |
|
return(0); |
102 |
+ |
} |
103 |
+ |
if (!formatval(fmt, s)) { |
104 |
+ |
rmx_addinfo(ip, s); |
105 |
+ |
return(0); |
106 |
+ |
} |
107 |
|
for (i = 1; i < DTend; i++) |
108 |
|
if (!strcmp(fmt, cm_fmt_id[i])) { |
109 |
|
ip->dtype = i; |
116 |
|
rmx_load_ascii(RMATRIX *rm, FILE *fp) |
117 |
|
{ |
118 |
|
int i, j, k; |
119 |
< |
#ifdef _WIN32 |
70 |
< |
_setmode(fileno(fp), _O_TEXT); |
71 |
< |
#endif |
119 |
> |
|
120 |
|
for (i = 0; i < rm->nrows; i++) |
121 |
|
for (j = 0; j < rm->ncols; j++) |
122 |
|
for (k = 0; k < rm->ncomp; k++) |
137 |
|
} |
138 |
|
for (i = 0; i < rm->nrows; i++) |
139 |
|
for (j = 0; j < rm->ncols; j++) { |
140 |
< |
if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
140 |
> |
if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
141 |
|
return(0); |
142 |
+ |
if (rm->swapin) |
143 |
+ |
swap32((char *)val, rm->ncomp); |
144 |
|
for (k = rm->ncomp; k--; ) |
145 |
|
rmx_lval(rm,i,j,k) = val[k]; |
146 |
|
} |
150 |
|
static int |
151 |
|
rmx_load_double(RMATRIX *rm, FILE *fp) |
152 |
|
{ |
153 |
< |
int i, j, k; |
104 |
< |
double val[100]; |
153 |
> |
int i, j; |
154 |
|
|
106 |
– |
if (rm->ncomp > 100) { |
107 |
– |
fputs("Unsupported # components in rmx_load_double()\n", stderr); |
108 |
– |
exit(1); |
109 |
– |
} |
155 |
|
for (i = 0; i < rm->nrows; i++) |
156 |
|
for (j = 0; j < rm->ncols; j++) { |
157 |
< |
if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
157 |
> |
if (getbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp) |
158 |
|
return(0); |
159 |
< |
for (k = rm->ncomp; k--; ) |
160 |
< |
rmx_lval(rm,i,j,k) = val[k]; |
159 |
> |
if (rm->swapin) |
160 |
> |
swap64((char *)&rmx_lval(rm,i,j,0), rm->ncomp); |
161 |
|
} |
162 |
|
return(1); |
163 |
|
} |
168 |
|
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
169 |
|
int i, j; |
170 |
|
|
171 |
< |
if (scan == NULL) |
171 |
> |
if (!scan) |
172 |
|
return(0); |
173 |
|
for (i = 0; i < rm->nrows; i++) { |
174 |
|
if (freadscan(scan, rm->ncols, fp) < 0) { |
187 |
|
|
188 |
|
/* Load matrix from supported file type */ |
189 |
|
RMATRIX * |
190 |
< |
rmx_load(const char *fname) |
190 |
> |
rmx_load(const char *inspec) |
191 |
|
{ |
192 |
|
FILE *fp = stdin; |
193 |
< |
DMINFO dinfo; |
193 |
> |
RMATRIX dinfo; |
194 |
|
RMATRIX *dnew; |
195 |
|
|
196 |
< |
if (fname == NULL) { /* reading from stdin? */ |
197 |
< |
fname = "<stdin>"; |
196 |
> |
if (!inspec) { /* reading from stdin? */ |
197 |
> |
inspec = "<stdin>"; |
198 |
> |
SET_FILE_BINARY(stdin); |
199 |
> |
} else if (inspec[0] == '!') { |
200 |
> |
if (!(fp = popen(inspec+1, "r"))) |
201 |
> |
return(NULL); |
202 |
> |
SET_FILE_BINARY(fp); |
203 |
|
} else { |
204 |
< |
const char *sp = fname; /* check suffix */ |
204 |
> |
const char *sp = inspec; /* check suffix */ |
205 |
|
while (*sp) |
206 |
|
++sp; |
207 |
< |
while (sp > fname && sp[-1] != '.') |
207 |
> |
while (sp > inspec && sp[-1] != '.') |
208 |
|
--sp; |
209 |
|
if (!strcasecmp(sp, "XML")) { /* assume it's a BSDF */ |
210 |
< |
CMATRIX *cm = cm_loadBTDF((char *)fname); |
211 |
< |
if (cm == NULL) |
210 |
> |
CMATRIX *cm = cm_loadBTDF((char *)inspec); |
211 |
> |
if (!cm) |
212 |
|
return(NULL); |
213 |
|
dnew = rmx_from_cmatrix(cm); |
214 |
|
cm_free(cm); |
215 |
+ |
dnew->dtype = DTascii; |
216 |
|
return(dnew); |
217 |
|
} |
218 |
|
/* else open it ourselves */ |
219 |
< |
if ((fp = fopen(fname, "rb")) == NULL) |
219 |
> |
if (!(fp = fopen(inspec, "rb"))) |
220 |
|
return(NULL); |
221 |
|
} |
222 |
|
#ifdef getc_unlocked |
223 |
|
flockfile(fp); |
224 |
|
#endif |
225 |
|
dinfo.nrows = dinfo.ncols = dinfo.ncomp = 0; |
226 |
< |
dinfo.dtype = DTascii; |
226 |
> |
dinfo.dtype = DTascii; /* assumed w/o FORMAT */ |
227 |
> |
dinfo.swapin = 0; |
228 |
> |
dinfo.info = NULL; |
229 |
|
if (getheader(fp, get_dminfo, &dinfo) < 0) { |
230 |
|
fclose(fp); |
231 |
|
return(NULL); |
232 |
|
} |
233 |
< |
if ((dinfo.dtype == DTrgbe) | (dinfo.dtype == DTxyze)) { |
233 |
> |
if ((dinfo.nrows <= 0) | (dinfo.ncols <= 0)) { |
234 |
|
if (!fscnresolu(&dinfo.ncols, &dinfo.nrows, fp)) { |
235 |
|
fclose(fp); |
236 |
|
return(NULL); |
237 |
|
} |
238 |
< |
dinfo.ncomp = 3; |
238 |
> |
if (dinfo.ncomp <= 0) |
239 |
> |
dinfo.ncomp = 3; |
240 |
> |
else if ((dinfo.dtype == DTrgbe) | (dinfo.dtype == DTxyze) && |
241 |
> |
dinfo.ncomp != 3) { |
242 |
> |
fclose(fp); |
243 |
> |
return(NULL); |
244 |
> |
} |
245 |
|
} |
246 |
|
dnew = rmx_alloc(dinfo.nrows, dinfo.ncols, dinfo.ncomp); |
247 |
< |
if (dnew == NULL) { |
247 |
> |
if (!dnew) { |
248 |
|
fclose(fp); |
249 |
|
return(NULL); |
250 |
|
} |
251 |
+ |
dnew->info = dinfo.info; |
252 |
|
switch (dinfo.dtype) { |
253 |
|
case DTascii: |
254 |
+ |
SET_FILE_TEXT(fp); |
255 |
|
if (!rmx_load_ascii(dnew, fp)) |
256 |
|
goto loaderr; |
257 |
+ |
dnew->dtype = DTascii; /* should leave double? */ |
258 |
|
break; |
259 |
|
case DTfloat: |
260 |
+ |
dnew->swapin = dinfo.swapin; |
261 |
|
if (!rmx_load_float(dnew, fp)) |
262 |
|
goto loaderr; |
263 |
+ |
dnew->dtype = DTfloat; |
264 |
|
break; |
265 |
|
case DTdouble: |
266 |
+ |
dnew->swapin = dinfo.swapin; |
267 |
|
if (!rmx_load_double(dnew, fp)) |
268 |
|
goto loaderr; |
269 |
+ |
dnew->dtype = DTdouble; |
270 |
|
break; |
271 |
|
case DTrgbe: |
272 |
|
case DTxyze: |
273 |
|
if (!rmx_load_rgbe(dnew, fp)) |
274 |
|
goto loaderr; |
275 |
+ |
dnew->dtype = dinfo.dtype; |
276 |
|
break; |
277 |
|
default: |
278 |
|
goto loaderr; |
279 |
|
} |
280 |
< |
if (fp != stdin) |
281 |
< |
fclose(fp); |
280 |
> |
if (fp != stdin) { |
281 |
> |
if (inspec[0] == '!') |
282 |
> |
pclose(fp); |
283 |
> |
else |
284 |
> |
fclose(fp); |
285 |
> |
} |
286 |
> |
#ifdef getc_unlocked |
287 |
> |
else |
288 |
> |
funlockfile(fp); |
289 |
> |
#endif |
290 |
|
return(dnew); |
291 |
|
loaderr: /* should report error? */ |
292 |
< |
fclose(fp); |
292 |
> |
if (inspec[0] == '!') |
293 |
> |
pclose(fp); |
294 |
> |
else |
295 |
> |
fclose(fp); |
296 |
|
rmx_free(dnew); |
297 |
|
return(NULL); |
298 |
|
} |
300 |
|
static int |
301 |
|
rmx_write_ascii(const RMATRIX *rm, FILE *fp) |
302 |
|
{ |
303 |
+ |
const char *fmt = (rm->dtype == DTfloat) ? " %.7e" : |
304 |
+ |
(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) ? " %.3e" : |
305 |
+ |
" %.15e" ; |
306 |
|
int i, j, k; |
307 |
< |
#ifdef _WIN32 |
227 |
< |
_setmode(fileno(fp), _O_TEXT); |
228 |
< |
#endif |
307 |
> |
|
308 |
|
for (i = 0; i < rm->nrows; i++) { |
309 |
|
for (j = 0; j < rm->ncols; j++) { |
310 |
|
for (k = 0; k < rm->ncomp; k++) |
311 |
< |
fprintf(fp, " %.15e", rmx_lval(rm,i,j,k)); |
311 |
> |
fprintf(fp, fmt, rmx_lval(rm,i,j,k)); |
312 |
|
fputc('\t', fp); |
313 |
|
} |
314 |
|
fputc('\n', fp); |
330 |
|
for (j = 0; j < rm->ncols; j++) { |
331 |
|
for (k = rm->ncomp; k--; ) |
332 |
|
val[k] = (float)rmx_lval(rm,i,j,k); |
333 |
< |
if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
333 |
> |
if (putbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
334 |
|
return(0); |
335 |
|
} |
336 |
|
return(1); |
339 |
|
static int |
340 |
|
rmx_write_double(const RMATRIX *rm, FILE *fp) |
341 |
|
{ |
342 |
< |
int i, j, k; |
264 |
< |
double val[100]; |
342 |
> |
int i, j; |
343 |
|
|
266 |
– |
if (rm->ncomp > 100) { |
267 |
– |
fputs("Unsupported # components in rmx_write_double()\n", stderr); |
268 |
– |
exit(1); |
269 |
– |
} |
344 |
|
for (i = 0; i < rm->nrows; i++) |
345 |
< |
for (j = 0; j < rm->ncols; j++) { |
346 |
< |
for (k = rm->ncomp; k--; ) |
273 |
< |
val[k] = rmx_lval(rm,i,j,k); |
274 |
< |
if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
345 |
> |
for (j = 0; j < rm->ncols; j++) |
346 |
> |
if (putbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp) |
347 |
|
return(0); |
276 |
– |
} |
348 |
|
return(1); |
349 |
|
} |
350 |
|
|
351 |
|
static int |
352 |
|
rmx_write_rgbe(const RMATRIX *rm, FILE *fp) |
353 |
|
{ |
354 |
< |
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
354 |
> |
COLR *scan = (COLR *)malloc(sizeof(COLR)*rm->ncols); |
355 |
|
int i, j; |
356 |
|
|
357 |
< |
if (scan == NULL) |
357 |
> |
if (!scan) |
358 |
|
return(0); |
359 |
|
for (i = 0; i < rm->nrows; i++) { |
360 |
|
for (j = rm->ncols; j--; ) |
361 |
< |
setcolor(scan[j], rmx_lval(rm,i,j,0), |
361 |
> |
setcolr(scan[j], rmx_lval(rm,i,j,0), |
362 |
|
rmx_lval(rm,i,j,1), |
363 |
|
rmx_lval(rm,i,j,2) ); |
364 |
< |
if (fwritescan(scan, rm->ncols, fp) < 0) { |
364 |
> |
if (fwritecolrs(scan, rm->ncols, fp) < 0) { |
365 |
|
free(scan); |
366 |
|
return(0); |
367 |
|
} |
370 |
|
return(1); |
371 |
|
} |
372 |
|
|
373 |
< |
/* Write matrix to file type indicated by dt */ |
374 |
< |
long |
373 |
> |
/* Write matrix to file type indicated by dtype */ |
374 |
> |
int |
375 |
|
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
376 |
|
{ |
377 |
|
RMATRIX *mydm = NULL; |
378 |
|
int ok = 1; |
379 |
|
|
380 |
< |
if ((rm == NULL) | (fp == NULL)) |
380 |
> |
if (!rm | !fp) |
381 |
|
return(0); |
382 |
+ |
#ifdef getc_unlocked |
383 |
+ |
flockfile(fp); |
384 |
+ |
#endif |
385 |
|
/* complete header */ |
386 |
+ |
if (rm->info) |
387 |
+ |
fputs(rm->info, fp); |
388 |
+ |
if (dtype == DTfromHeader) |
389 |
+ |
dtype = rm->dtype; |
390 |
+ |
else if ((dtype == DTrgbe) & (rm->dtype == DTxyze)) |
391 |
+ |
dtype = DTxyze; |
392 |
+ |
else if ((dtype == DTxyze) & (rm->dtype == DTrgbe)) |
393 |
+ |
dtype = DTrgbe; |
394 |
|
if ((dtype != DTrgbe) & (dtype != DTxyze)) { |
395 |
|
fprintf(fp, "NROWS=%d\n", rm->nrows); |
396 |
|
fprintf(fp, "NCOLS=%d\n", rm->ncols); |
401 |
|
return(0); |
402 |
|
cmtx[0] = cmtx[1] = cmtx[2] = 1; |
403 |
|
mydm = rmx_transform(rm, 3, cmtx); |
404 |
< |
if (mydm == NULL) |
404 |
> |
if (!mydm) |
405 |
|
return(0); |
406 |
|
rm = mydm; |
407 |
|
} |
408 |
+ |
if ((dtype == DTfloat) | (dtype == DTdouble)) |
409 |
+ |
fputendian(fp); /* important to record */ |
410 |
|
fputformat((char *)cm_fmt_id[dtype], fp); |
411 |
|
fputc('\n', fp); |
412 |
|
switch (dtype) { /* write data */ |
428 |
|
return(0); |
429 |
|
} |
430 |
|
ok &= (fflush(fp) == 0); |
431 |
< |
rmx_free(mydm); |
432 |
< |
return(ftell(fp) * ok); /* return # bytes written */ |
431 |
> |
#ifdef getc_unlocked |
432 |
> |
funlockfile(fp); |
433 |
> |
#endif |
434 |
> |
if (mydm) |
435 |
> |
rmx_free(mydm); |
436 |
> |
return(ok); |
437 |
|
} |
438 |
|
|
439 |
|
/* Allocate and assign square identity matrix with n components */ |
441 |
|
rmx_identity(const int dim, const int n) |
442 |
|
{ |
443 |
|
RMATRIX *rid = rmx_alloc(dim, dim, n); |
444 |
< |
int i; |
444 |
> |
int i, k; |
445 |
|
|
446 |
< |
if (rid == NULL) |
446 |
> |
if (!rid) |
447 |
|
return(NULL); |
448 |
< |
memset(rid->mtx, 0, sizeof(rid->mtx[0])*dim*dim); |
448 |
> |
memset(rid->mtx, 0, sizeof(rid->mtx[0])*n*dim*dim); |
449 |
|
for (i = dim; i--; ) |
450 |
< |
rmx_lval(rid,i,i,0) = 1; |
451 |
< |
for (i = n; --i; ) |
364 |
< |
memcpy(rid->mtx+i*(dim*dim), rid->mtx, |
365 |
< |
sizeof(rid->mtx[0])*dim*dim); |
450 |
> |
for (k = n; k--; ) |
451 |
> |
rmx_lval(rid,i,i,k) = 1; |
452 |
|
return(rid); |
453 |
|
} |
454 |
|
|
458 |
|
{ |
459 |
|
RMATRIX *dnew; |
460 |
|
|
461 |
< |
if (rm == NULL) |
461 |
> |
if (!rm) |
462 |
|
return(NULL); |
463 |
|
dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp); |
464 |
< |
if (dnew == NULL) |
464 |
> |
if (!dnew) |
465 |
|
return(NULL); |
466 |
+ |
rmx_addinfo(dnew, rm->info); |
467 |
+ |
dnew->dtype = rm->dtype; |
468 |
|
memcpy(dnew->mtx, rm->mtx, |
469 |
|
sizeof(rm->mtx[0])*rm->ncomp*rm->nrows*rm->ncols); |
470 |
|
return(dnew); |
477 |
|
RMATRIX *dnew; |
478 |
|
int i, j, k; |
479 |
|
|
480 |
< |
if (rm == NULL) |
480 |
> |
if (!rm) |
481 |
|
return(0); |
482 |
+ |
if ((rm->nrows == 1) | (rm->ncols == 1)) { |
483 |
+ |
dnew = rmx_copy(rm); |
484 |
+ |
if (!dnew) |
485 |
+ |
return(NULL); |
486 |
+ |
dnew->nrows = rm->ncols; |
487 |
+ |
dnew->ncols = rm->nrows; |
488 |
+ |
return(dnew); |
489 |
+ |
} |
490 |
|
dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp); |
491 |
< |
if (dnew == NULL) |
491 |
> |
if (!dnew) |
492 |
|
return(NULL); |
493 |
+ |
if (rm->info) { |
494 |
+ |
rmx_addinfo(dnew, rm->info); |
495 |
+ |
rmx_addinfo(dnew, "Transposed rows and columns\n"); |
496 |
+ |
} |
497 |
+ |
dnew->dtype = rm->dtype; |
498 |
|
for (i = dnew->nrows; i--; ) |
499 |
|
for (j = dnew->ncols; j--; ) |
500 |
|
for (k = dnew->ncomp; k--; ) |
509 |
|
RMATRIX *mres; |
510 |
|
int i, j, k, h; |
511 |
|
|
512 |
< |
if ((m1 == NULL) | (m2 == NULL) || |
412 |
< |
(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
512 |
> |
if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
513 |
|
return(NULL); |
514 |
|
mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp); |
515 |
< |
if (mres == NULL) |
515 |
> |
if (!mres) |
516 |
|
return(NULL); |
517 |
+ |
i = rmx_newtype(m1->dtype, m2->dtype); |
518 |
+ |
if (i) |
519 |
+ |
mres->dtype = i; |
520 |
+ |
else |
521 |
+ |
rmx_addinfo(mres, rmx_mismatch_warn); |
522 |
|
for (i = mres->nrows; i--; ) |
523 |
|
for (j = mres->ncols; j--; ) |
524 |
< |
for (h = m1->ncols; h--; ) { |
524 |
> |
for (k = mres->ncomp; k--; ) { |
525 |
|
long double d = 0; |
526 |
< |
for (k = mres->ncomp; k--; ) |
527 |
< |
d += (long double)rmx_lval(m1,i,h,k) * |
423 |
< |
(long double)rmx_lval(m2,h,j,k); |
526 |
> |
for (h = m1->ncols; h--; ) |
527 |
> |
d += rmx_lval(m1,i,h,k) * rmx_lval(m2,h,j,k); |
528 |
|
rmx_lval(mres,i,j,k) = (double)d; |
529 |
|
} |
530 |
|
return(mres); |
531 |
|
} |
532 |
|
|
533 |
+ |
/* Element-wise multiplication (or division) of m2 into m1 */ |
534 |
+ |
int |
535 |
+ |
rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide) |
536 |
+ |
{ |
537 |
+ |
int zeroDivides = 0; |
538 |
+ |
int i, j, k; |
539 |
+ |
|
540 |
+ |
if (!m1 | !m2 || (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
541 |
+ |
return(0); |
542 |
+ |
if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp)) |
543 |
+ |
return(0); |
544 |
+ |
i = rmx_newtype(m1->dtype, m2->dtype); |
545 |
+ |
if (i) |
546 |
+ |
m1->dtype = i; |
547 |
+ |
else |
548 |
+ |
rmx_addinfo(m1, rmx_mismatch_warn); |
549 |
+ |
for (i = m1->nrows; i--; ) |
550 |
+ |
for (j = m1->ncols; j--; ) |
551 |
+ |
if (divide) { |
552 |
+ |
double d; |
553 |
+ |
if (m2->ncomp == 1) { |
554 |
+ |
d = rmx_lval(m2,i,j,0); |
555 |
+ |
if (d == 0) { |
556 |
+ |
++zeroDivides; |
557 |
+ |
for (k = m1->ncomp; k--; ) |
558 |
+ |
rmx_lval(m1,i,j,k) = 0; |
559 |
+ |
} else { |
560 |
+ |
d = 1./d; |
561 |
+ |
for (k = m1->ncomp; k--; ) |
562 |
+ |
rmx_lval(m1,i,j,k) *= d; |
563 |
+ |
} |
564 |
+ |
} else |
565 |
+ |
for (k = m1->ncomp; k--; ) { |
566 |
+ |
d = rmx_lval(m2,i,j,k); |
567 |
+ |
if (d == 0) { |
568 |
+ |
++zeroDivides; |
569 |
+ |
rmx_lval(m1,i,j,k) = 0; |
570 |
+ |
} else |
571 |
+ |
rmx_lval(m1,i,j,k) /= d; |
572 |
+ |
} |
573 |
+ |
} else { |
574 |
+ |
if (m2->ncomp == 1) { |
575 |
+ |
const double d = rmx_lval(m2,i,j,0); |
576 |
+ |
for (k = m1->ncomp; k--; ) |
577 |
+ |
rmx_lval(m1,i,j,k) *= d; |
578 |
+ |
} else |
579 |
+ |
for (k = m1->ncomp; k--; ) |
580 |
+ |
rmx_lval(m1,i,j,k) *= rmx_lval(m2,i,j,k); |
581 |
+ |
} |
582 |
+ |
if (zeroDivides) { |
583 |
+ |
rmx_addinfo(m1, "WARNING: zero divide(s) corrupted results\n"); |
584 |
+ |
errno = ERANGE; |
585 |
+ |
} |
586 |
+ |
return(1); |
587 |
+ |
} |
588 |
+ |
|
589 |
|
/* Sum second matrix into first, applying scale factor beforehand */ |
590 |
|
int |
591 |
|
rmx_sum(RMATRIX *msum, const RMATRIX *madd, const double sf[]) |
593 |
|
double *mysf = NULL; |
594 |
|
int i, j, k; |
595 |
|
|
596 |
< |
if ((msum == NULL) | (madd == NULL) || |
596 |
> |
if (!msum | !madd || |
597 |
|
(msum->nrows != madd->nrows) | |
598 |
|
(msum->ncols != madd->ncols) | |
599 |
|
(msum->ncomp != madd->ncomp)) |
600 |
|
return(0); |
601 |
< |
if (sf == NULL) { |
601 |
> |
if (!sf) { |
602 |
|
mysf = (double *)malloc(sizeof(double)*msum->ncomp); |
603 |
< |
if (mysf == NULL) |
603 |
> |
if (!mysf) |
604 |
|
return(0); |
605 |
|
for (k = msum->ncomp; k--; ) |
606 |
|
mysf[k] = 1; |
607 |
|
sf = mysf; |
608 |
|
} |
609 |
+ |
i = rmx_newtype(msum->dtype, madd->dtype); |
610 |
+ |
if (i) |
611 |
+ |
msum->dtype = i; |
612 |
+ |
else |
613 |
+ |
rmx_addinfo(msum, rmx_mismatch_warn); |
614 |
|
for (i = msum->nrows; i--; ) |
615 |
|
for (j = msum->ncols; j--; ) |
616 |
|
for (k = msum->ncomp; k--; ) |
617 |
|
rmx_lval(msum,i,j,k) += sf[k] * rmx_lval(madd,i,j,k); |
618 |
< |
|
619 |
< |
free(mysf); |
618 |
> |
if (mysf) |
619 |
> |
free(mysf); |
620 |
|
return(1); |
621 |
|
} |
622 |
|
|
626 |
|
{ |
627 |
|
int i, j, k; |
628 |
|
|
629 |
< |
if ((rm == NULL) | (sf == NULL)) |
629 |
> |
if (!rm | !sf) |
630 |
|
return(0); |
631 |
|
for (i = rm->nrows; i--; ) |
632 |
|
for (j = rm->ncols; j--; ) |
633 |
|
for (k = rm->ncomp; k--; ) |
634 |
|
rmx_lval(rm,i,j,k) *= sf[k]; |
635 |
|
|
636 |
+ |
if (rm->info) |
637 |
+ |
rmx_addinfo(rm, "Applied scalar\n"); |
638 |
|
return(1); |
639 |
|
} |
640 |
|
|
645 |
|
int i, j, ks, kd; |
646 |
|
RMATRIX *dnew; |
647 |
|
|
648 |
< |
if ((msrc == NULL) | (n <= 0) | (cmat == NULL)) |
648 |
> |
if (!msrc | (n <= 0) | !cmat) |
649 |
|
return(NULL); |
650 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
651 |
< |
if (dnew == NULL) |
651 |
> |
if (!dnew) |
652 |
|
return(NULL); |
653 |
+ |
if (msrc->info) { |
654 |
+ |
char buf[128]; |
655 |
+ |
sprintf(buf, "Applied %dx%d component transform\n", |
656 |
+ |
dnew->ncomp, msrc->ncomp); |
657 |
+ |
rmx_addinfo(dnew, msrc->info); |
658 |
+ |
rmx_addinfo(dnew, buf); |
659 |
+ |
} |
660 |
+ |
dnew->dtype = msrc->dtype; |
661 |
|
for (i = dnew->nrows; i--; ) |
662 |
|
for (j = dnew->ncols; j--; ) |
663 |
|
for (kd = dnew->ncomp; kd--; ) { |
676 |
|
int i, j; |
677 |
|
RMATRIX *dnew; |
678 |
|
|
679 |
< |
if (cm == NULL) |
679 |
> |
if (!cm) |
680 |
|
return(NULL); |
681 |
|
dnew = rmx_alloc(cm->nrows, cm->ncols, 3); |
682 |
< |
if (dnew == NULL) |
682 |
> |
if (!dnew) |
683 |
|
return(NULL); |
684 |
+ |
dnew->dtype = DTfloat; |
685 |
|
for (i = dnew->nrows; i--; ) |
686 |
|
for (j = dnew->ncols; j--; ) { |
687 |
|
const COLORV *cv = cm_lval(cm,i,j); |
699 |
|
int i, j; |
700 |
|
CMATRIX *cnew; |
701 |
|
|
702 |
< |
if (rm == NULL || rm->ncomp != 3) |
702 |
> |
if (!rm || rm->ncomp != 3) |
703 |
|
return(NULL); |
704 |
|
cnew = cm_alloc(rm->nrows, rm->ncols); |
705 |
< |
if (cnew == NULL) |
705 |
> |
if (!cnew) |
706 |
|
return(NULL); |
707 |
|
for (i = cnew->nrows; i--; ) |
708 |
|
for (j = cnew->ncols; j--; ) { |