5 |
|
* General matrix operations. |
6 |
|
*/ |
7 |
|
|
8 |
– |
#include <stdio.h> |
8 |
|
#include <stdlib.h> |
10 |
– |
#include <string.h> |
11 |
– |
#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 |
+ |
#if !defined(_WIN32) && !defined(_WIN64) |
16 |
+ |
#include <sys/mman.h> |
17 |
+ |
#endif |
18 |
|
|
19 |
|
static char rmx_mismatch_warn[] = "WARNING: data type mismatch\n"; |
20 |
|
|
21 |
< |
/* Allocate a nr x nc matrix with n components */ |
21 |
> |
#define array_size(rm) (sizeof(double)*(rm)->nrows*(rm)->ncols*(rm)->ncomp) |
22 |
> |
#define mapped_size(rm) ((char *)(rm)->mtx + array_size(rm) - (char *)(rm)->mapped) |
23 |
> |
|
24 |
> |
/* Initialize a RMATRIX struct but don't allocate array space */ |
25 |
|
RMATRIX * |
26 |
+ |
rmx_new(int nr, int nc, int n) |
27 |
+ |
{ |
28 |
+ |
RMATRIX *dnew = (RMATRIX *)calloc(1, sizeof(RMATRIX)); |
29 |
+ |
|
30 |
+ |
if (dnew) { |
31 |
+ |
dnew->dtype = DTdouble; |
32 |
+ |
dnew->nrows = nr; |
33 |
+ |
dnew->ncols = nc; |
34 |
+ |
dnew->ncomp = n; |
35 |
+ |
} |
36 |
+ |
return(dnew); |
37 |
+ |
} |
38 |
+ |
|
39 |
+ |
/* Prepare a RMATRIX for writing (allocate array if needed) */ |
40 |
+ |
int |
41 |
+ |
rmx_prepare(RMATRIX *rm) |
42 |
+ |
{ |
43 |
+ |
if (!rm) return(0); |
44 |
+ |
if (rm->mtx) |
45 |
+ |
return(1); |
46 |
+ |
rm->mtx = (double *)malloc(array_size(rm)); |
47 |
+ |
return(rm->mtx != NULL); |
48 |
+ |
} |
49 |
+ |
|
50 |
+ |
/* Call rmx_new() and rmx_prepare() */ |
51 |
+ |
RMATRIX * |
52 |
|
rmx_alloc(int nr, int nc, int n) |
53 |
|
{ |
54 |
< |
RMATRIX *dnew; |
54 |
> |
RMATRIX *dnew = rmx_new(nr, nc, n); |
55 |
|
|
56 |
< |
if ((nr <= 0) | (nc <= 0) | (n <= 0)) |
57 |
< |
return(NULL); |
58 |
< |
dnew = (RMATRIX *)malloc(sizeof(RMATRIX)-sizeof(dnew->mtx) + |
59 |
< |
sizeof(dnew->mtx[0])*(n*nr*nc)); |
31 |
< |
if (dnew == NULL) |
32 |
< |
return(NULL); |
33 |
< |
dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n; |
34 |
< |
dnew->dtype = DTdouble; |
35 |
< |
dnew->info = NULL; |
56 |
> |
if (dnew && !rmx_prepare(dnew)) { |
57 |
> |
rmx_free(dnew); |
58 |
> |
dnew = NULL; |
59 |
> |
} |
60 |
|
return(dnew); |
61 |
|
} |
62 |
|
|
67 |
|
if (!rm) return; |
68 |
|
if (rm->info) |
69 |
|
free(rm->info); |
70 |
+ |
#ifdef MAP_FILE |
71 |
+ |
if (rm->mapped) |
72 |
+ |
munmap(rm->mapped, mapped_size(rm)); |
73 |
+ |
else |
74 |
+ |
#endif |
75 |
+ |
free(rm->mtx); |
76 |
|
free(rm); |
77 |
|
} |
78 |
|
|
93 |
|
int |
94 |
|
rmx_addinfo(RMATRIX *rm, const char *info) |
95 |
|
{ |
96 |
< |
if (!info || !*info) |
96 |
> |
int oldlen = 0; |
97 |
> |
|
98 |
> |
if (!rm || !info || !*info) |
99 |
|
return(0); |
100 |
|
if (!rm->info) { |
101 |
|
rm->info = (char *)malloc(strlen(info)+1); |
102 |
|
if (rm->info) rm->info[0] = '\0'; |
103 |
< |
} else |
103 |
> |
} else { |
104 |
> |
oldlen = strlen(rm->info); |
105 |
|
rm->info = (char *)realloc(rm->info, |
106 |
< |
strlen(rm->info)+strlen(info)+1); |
106 |
> |
oldlen+strlen(info)+1); |
107 |
> |
} |
108 |
|
if (!rm->info) |
109 |
|
return(0); |
110 |
< |
strcat(rm->info, info); |
110 |
> |
strcpy(rm->info+oldlen, info); |
111 |
|
return(1); |
112 |
|
} |
113 |
|
|
115 |
|
get_dminfo(char *s, void *p) |
116 |
|
{ |
117 |
|
RMATRIX *ip = (RMATRIX *)p; |
118 |
< |
char fmt[64]; |
118 |
> |
char fmt[MAXFMTLEN]; |
119 |
|
int i; |
120 |
|
|
121 |
|
if (headidval(fmt, s)) |
132 |
|
ip->ncols = atoi(s+6); |
133 |
|
return(0); |
134 |
|
} |
135 |
+ |
if ((i = isbigendian(s)) >= 0) { |
136 |
+ |
ip->swapin = (nativebigendian() != i); |
137 |
+ |
return(0); |
138 |
+ |
} |
139 |
+ |
if (isexpos(s)) { |
140 |
+ |
double d = exposval(s); |
141 |
+ |
scalecolor(ip->cexp, d); |
142 |
+ |
return(0); |
143 |
+ |
} |
144 |
+ |
if (iscolcor(s)) { |
145 |
+ |
COLOR ctmp; |
146 |
+ |
colcorval(ctmp, s); |
147 |
+ |
multcolor(ip->cexp, ctmp); |
148 |
+ |
return(0); |
149 |
+ |
} |
150 |
|
if (!formatval(fmt, s)) { |
151 |
|
rmx_addinfo(ip, s); |
152 |
|
return(0); |
153 |
< |
} |
153 |
> |
} /* else check format */ |
154 |
|
for (i = 1; i < DTend; i++) |
155 |
|
if (!strcmp(fmt, cm_fmt_id[i])) { |
156 |
|
ip->dtype = i; |
164 |
|
{ |
165 |
|
int i, j, k; |
166 |
|
|
167 |
+ |
if (!rmx_prepare(rm)) |
168 |
+ |
return(0); |
169 |
|
for (i = 0; i < rm->nrows; i++) |
170 |
|
for (j = 0; j < rm->ncols; j++) |
171 |
|
for (k = 0; k < rm->ncomp; k++) |
184 |
|
fputs("Unsupported # components in rmx_load_float()\n", stderr); |
185 |
|
exit(1); |
186 |
|
} |
187 |
+ |
if (!rmx_prepare(rm)) |
188 |
+ |
return(0); |
189 |
|
for (i = 0; i < rm->nrows; i++) |
190 |
|
for (j = 0; j < rm->ncols; j++) { |
191 |
|
if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
192 |
|
return(0); |
193 |
+ |
if (rm->swapin) |
194 |
+ |
swap32((char *)val, rm->ncomp); |
195 |
|
for (k = rm->ncomp; k--; ) |
196 |
|
rmx_lval(rm,i,j,k) = val[k]; |
197 |
|
} |
201 |
|
static int |
202 |
|
rmx_load_double(RMATRIX *rm, FILE *fp) |
203 |
|
{ |
204 |
< |
int i, j; |
205 |
< |
|
206 |
< |
for (i = 0; i < rm->nrows; i++) |
207 |
< |
for (j = 0; j < rm->ncols; j++) |
208 |
< |
if (getbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp) |
209 |
< |
return(0); |
204 |
> |
int i; |
205 |
> |
#ifdef MAP_FILE |
206 |
> |
long pos; /* map memory to file if possible */ |
207 |
> |
if (!rm->swapin && array_size(rm) >= 1L<<20 && |
208 |
> |
(pos = ftell(fp)) >= 0 && !(pos % sizeof(double))) { |
209 |
> |
rm->mapped = mmap(NULL, array_size(rm)+pos, PROT_READ|PROT_WRITE, |
210 |
> |
MAP_PRIVATE, fileno(fp), 0); |
211 |
> |
if (rm->mapped != MAP_FAILED) { |
212 |
> |
rm->mtx = (double *)rm->mapped + pos/sizeof(double); |
213 |
> |
return(1); |
214 |
> |
} |
215 |
> |
rm->mapped = NULL; |
216 |
> |
} |
217 |
> |
#endif |
218 |
> |
if (!rmx_prepare(rm)) |
219 |
> |
return(0); |
220 |
> |
for (i = 0; i < rm->nrows; i++) { |
221 |
> |
if (getbinary(&rmx_lval(rm,i,0,0), sizeof(double)*rm->ncomp, |
222 |
> |
rm->ncols, fp) != rm->ncols) |
223 |
> |
return(0); |
224 |
> |
if (rm->swapin) |
225 |
> |
swap64((char *)&rmx_lval(rm,i,0,0), rm->ncols*rm->ncomp); |
226 |
> |
} |
227 |
|
return(1); |
228 |
|
} |
229 |
|
|
233 |
|
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
234 |
|
int i, j; |
235 |
|
|
236 |
< |
if (scan == NULL) |
236 |
> |
if (!scan) |
237 |
|
return(0); |
238 |
+ |
if (!rmx_prepare(rm)) |
239 |
+ |
return(0); |
240 |
|
for (i = 0; i < rm->nrows; i++) { |
241 |
|
if (freadscan(scan, rm->ncols, fp) < 0) { |
242 |
|
free(scan); |
254 |
|
|
255 |
|
/* Load matrix from supported file type */ |
256 |
|
RMATRIX * |
257 |
< |
rmx_load(const char *inspec) |
257 |
> |
rmx_load(const char *inspec, RMPref rmp) |
258 |
|
{ |
259 |
< |
FILE *fp = stdin; |
186 |
< |
RMATRIX dinfo; |
259 |
> |
FILE *fp; |
260 |
|
RMATRIX *dnew; |
261 |
|
|
262 |
< |
if (inspec == NULL) { /* reading from stdin? */ |
263 |
< |
inspec = "<stdin>"; |
264 |
< |
SET_FILE_BINARY(stdin); |
262 |
> |
if (!inspec) |
263 |
> |
inspec = stdin_name; |
264 |
> |
else if (!*inspec) |
265 |
> |
return(NULL); |
266 |
> |
if (inspec == stdin_name) { /* reading from stdin? */ |
267 |
> |
fp = stdin; |
268 |
|
} else if (inspec[0] == '!') { |
269 |
< |
if ((fp = popen(inspec+1, "r")) == NULL) |
269 |
> |
if (!(fp = popen(inspec+1, "r"))) |
270 |
|
return(NULL); |
195 |
– |
SET_FILE_BINARY(stdin); |
271 |
|
} else { |
272 |
|
const char *sp = inspec; /* check suffix */ |
273 |
|
while (*sp) |
275 |
|
while (sp > inspec && sp[-1] != '.') |
276 |
|
--sp; |
277 |
|
if (!strcasecmp(sp, "XML")) { /* assume it's a BSDF */ |
278 |
< |
CMATRIX *cm = cm_loadBTDF((char *)inspec); |
279 |
< |
if (cm == NULL) |
278 |
> |
CMATRIX *cm = rmp==RMPtrans ? cm_loadBTDF(inspec) : |
279 |
> |
cm_loadBRDF(inspec, rmp==RMPreflB) ; |
280 |
> |
if (!cm) |
281 |
|
return(NULL); |
282 |
|
dnew = rmx_from_cmatrix(cm); |
283 |
|
cm_free(cm); |
285 |
|
return(dnew); |
286 |
|
} |
287 |
|
/* else open it ourselves */ |
288 |
< |
if ((fp = fopen(inspec, "rb")) == NULL) |
288 |
> |
if (!(fp = fopen(inspec, "r"))) |
289 |
|
return(NULL); |
290 |
|
} |
291 |
+ |
SET_FILE_BINARY(fp); |
292 |
|
#ifdef getc_unlocked |
293 |
|
flockfile(fp); |
294 |
|
#endif |
295 |
< |
dinfo.nrows = dinfo.ncols = dinfo.ncomp = 0; |
219 |
< |
dinfo.dtype = DTascii; /* assumed w/o FORMAT */ |
220 |
< |
dinfo.info = NULL; |
221 |
< |
if (getheader(fp, get_dminfo, &dinfo) < 0) { |
295 |
> |
if (!(dnew = rmx_new(0,0,3))) { |
296 |
|
fclose(fp); |
297 |
|
return(NULL); |
298 |
|
} |
299 |
< |
if ((dinfo.nrows <= 0) | (dinfo.ncols <= 0)) { |
300 |
< |
if (!fscnresolu(&dinfo.ncols, &dinfo.nrows, fp)) { |
299 |
> |
dnew->dtype = DTascii; /* assumed w/o FORMAT */ |
300 |
> |
dnew->cexp[0] = dnew->cexp[1] = dnew->cexp[2] = 1.f; |
301 |
> |
if (getheader(fp, get_dminfo, dnew) < 0) { |
302 |
> |
fclose(fp); |
303 |
> |
return(NULL); |
304 |
> |
} |
305 |
> |
if ((dnew->nrows <= 0) | (dnew->ncols <= 0)) { |
306 |
> |
if (!fscnresolu(&dnew->ncols, &dnew->nrows, fp)) { |
307 |
|
fclose(fp); |
308 |
|
return(NULL); |
309 |
|
} |
310 |
< |
if (dinfo.ncomp <= 0) |
311 |
< |
dinfo.ncomp = 3; |
232 |
< |
else if ((dinfo.dtype == DTrgbe) | (dinfo.dtype == DTxyze) && |
233 |
< |
dinfo.ncomp != 3) { |
310 |
> |
if ((dnew->dtype == DTrgbe) | (dnew->dtype == DTxyze) && |
311 |
> |
dnew->ncomp != 3) { |
312 |
|
fclose(fp); |
313 |
|
return(NULL); |
314 |
|
} |
315 |
|
} |
316 |
< |
dnew = rmx_alloc(dinfo.nrows, dinfo.ncols, dinfo.ncomp); |
239 |
< |
if (dnew == NULL) { |
240 |
< |
fclose(fp); |
241 |
< |
return(NULL); |
242 |
< |
} |
243 |
< |
dnew->info = dinfo.info; |
244 |
< |
switch (dinfo.dtype) { |
316 |
> |
switch (dnew->dtype) { |
317 |
|
case DTascii: |
318 |
< |
SET_FILE_TEXT(stdin); |
318 |
> |
SET_FILE_TEXT(fp); |
319 |
|
if (!rmx_load_ascii(dnew, fp)) |
320 |
|
goto loaderr; |
321 |
|
dnew->dtype = DTascii; /* should leave double? */ |
334 |
|
case DTxyze: |
335 |
|
if (!rmx_load_rgbe(dnew, fp)) |
336 |
|
goto loaderr; |
337 |
< |
dnew->dtype = dinfo.dtype; |
337 |
> |
/* undo exposure? */ |
338 |
> |
if ((dnew->cexp[0] != 1.f) | (dnew->cexp[1] != 1.f) | |
339 |
> |
(dnew->cexp[2] != 1.f)) { |
340 |
> |
double cmlt[3]; |
341 |
> |
cmlt[0] = 1./dnew->cexp[0]; |
342 |
> |
cmlt[1] = 1./dnew->cexp[1]; |
343 |
> |
cmlt[2] = 1./dnew->cexp[2]; |
344 |
> |
rmx_scale(dnew, cmlt); |
345 |
> |
} |
346 |
> |
dnew->swapin = 0; |
347 |
|
break; |
348 |
|
default: |
349 |
|
goto loaderr; |
371 |
|
static int |
372 |
|
rmx_write_ascii(const RMATRIX *rm, FILE *fp) |
373 |
|
{ |
374 |
+ |
const char *fmt = (rm->dtype == DTfloat) ? " %.7e" : |
375 |
+ |
(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) ? " %.3e" : |
376 |
+ |
" %.15e" ; |
377 |
|
int i, j, k; |
378 |
|
|
379 |
|
for (i = 0; i < rm->nrows; i++) { |
380 |
|
for (j = 0; j < rm->ncols; j++) { |
381 |
|
for (k = 0; k < rm->ncomp; k++) |
382 |
< |
fprintf(fp, " %.15e", rmx_lval(rm,i,j,k)); |
382 |
> |
fprintf(fp, fmt, rmx_lval(rm,i,j,k)); |
383 |
|
fputc('\t', fp); |
384 |
|
} |
385 |
|
fputc('\n', fp); |
425 |
|
COLR *scan = (COLR *)malloc(sizeof(COLR)*rm->ncols); |
426 |
|
int i, j; |
427 |
|
|
428 |
< |
if (scan == NULL) |
428 |
> |
if (!scan) |
429 |
|
return(0); |
430 |
|
for (i = 0; i < rm->nrows; i++) { |
431 |
|
for (j = rm->ncols; j--; ) |
441 |
|
return(1); |
442 |
|
} |
443 |
|
|
444 |
+ |
/* Check if CIE XYZ primaries were specified */ |
445 |
+ |
static int |
446 |
+ |
findCIEprims(const char *info) |
447 |
+ |
{ |
448 |
+ |
RGBPRIMS prims; |
449 |
+ |
|
450 |
+ |
if (!info) |
451 |
+ |
return(0); |
452 |
+ |
info = strstr(info, PRIMARYSTR); |
453 |
+ |
if (!info || !primsval(prims, info)) |
454 |
+ |
return(0); |
455 |
+ |
|
456 |
+ |
return((prims[RED][CIEX] > .99) & (prims[RED][CIEY] < .01) && |
457 |
+ |
(prims[GRN][CIEX] < .01) & (prims[GRN][CIEY] > .99) && |
458 |
+ |
(prims[BLU][CIEX] < .01) & (prims[BLU][CIEY] < .01)); |
459 |
+ |
} |
460 |
+ |
|
461 |
|
/* Write matrix to file type indicated by dtype */ |
462 |
|
int |
463 |
|
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
465 |
|
RMATRIX *mydm = NULL; |
466 |
|
int ok = 1; |
467 |
|
|
468 |
< |
if ((rm == NULL) | (fp == NULL)) |
468 |
> |
if (!rm | !fp) |
469 |
|
return(0); |
470 |
|
#ifdef getc_unlocked |
471 |
|
flockfile(fp); |
475 |
|
fputs(rm->info, fp); |
476 |
|
if (dtype == DTfromHeader) |
477 |
|
dtype = rm->dtype; |
478 |
< |
else if ((dtype == DTrgbe) & (rm->dtype == DTxyze)) |
478 |
> |
else if (dtype == DTrgbe && (rm->dtype == DTxyze || |
479 |
> |
findCIEprims(rm->info))) |
480 |
|
dtype = DTxyze; |
481 |
|
else if ((dtype == DTxyze) & (rm->dtype == DTrgbe)) |
482 |
|
dtype = DTrgbe; |
490 |
|
return(0); |
491 |
|
cmtx[0] = cmtx[1] = cmtx[2] = 1; |
492 |
|
mydm = rmx_transform(rm, 3, cmtx); |
493 |
< |
if (mydm == NULL) |
493 |
> |
if (!mydm) |
494 |
|
return(0); |
495 |
|
rm = mydm; |
496 |
|
} |
497 |
< |
fputformat((char *)cm_fmt_id[dtype], fp); |
497 |
> |
if ((dtype == DTfloat) | (dtype == DTdouble)) |
498 |
> |
fputendian(fp); /* important to record */ |
499 |
> |
fputformat(cm_fmt_id[dtype], fp); |
500 |
|
fputc('\n', fp); |
501 |
|
switch (dtype) { /* write data */ |
502 |
|
case DTascii: |
520 |
|
#ifdef getc_unlocked |
521 |
|
funlockfile(fp); |
522 |
|
#endif |
523 |
< |
rmx_free(mydm); |
523 |
> |
if (mydm) |
524 |
> |
rmx_free(mydm); |
525 |
|
return(ok); |
526 |
|
} |
527 |
|
|
532 |
|
RMATRIX *rid = rmx_alloc(dim, dim, n); |
533 |
|
int i, k; |
534 |
|
|
535 |
< |
if (rid == NULL) |
535 |
> |
if (!rid) |
536 |
|
return(NULL); |
537 |
|
memset(rid->mtx, 0, sizeof(rid->mtx[0])*n*dim*dim); |
538 |
|
for (i = dim; i--; ) |
547 |
|
{ |
548 |
|
RMATRIX *dnew; |
549 |
|
|
550 |
< |
if (rm == NULL) |
550 |
> |
if (!rm) |
551 |
|
return(NULL); |
552 |
|
dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp); |
553 |
< |
if (dnew == NULL) |
553 |
> |
if (!dnew) |
554 |
|
return(NULL); |
555 |
|
rmx_addinfo(dnew, rm->info); |
556 |
|
dnew->dtype = rm->dtype; |
566 |
|
RMATRIX *dnew; |
567 |
|
int i, j, k; |
568 |
|
|
569 |
< |
if (rm == NULL) |
569 |
> |
if (!rm) |
570 |
|
return(0); |
571 |
+ |
if ((rm->nrows == 1) | (rm->ncols == 1)) { |
572 |
+ |
dnew = rmx_copy(rm); |
573 |
+ |
if (!dnew) |
574 |
+ |
return(NULL); |
575 |
+ |
dnew->nrows = rm->ncols; |
576 |
+ |
dnew->ncols = rm->nrows; |
577 |
+ |
return(dnew); |
578 |
+ |
} |
579 |
|
dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp); |
580 |
< |
if (dnew == NULL) |
580 |
> |
if (!dnew) |
581 |
|
return(NULL); |
582 |
|
if (rm->info) { |
583 |
|
rmx_addinfo(dnew, rm->info); |
598 |
|
RMATRIX *mres; |
599 |
|
int i, j, k, h; |
600 |
|
|
601 |
< |
if ((m1 == NULL) | (m2 == NULL) || |
489 |
< |
(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
601 |
> |
if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
602 |
|
return(NULL); |
603 |
|
mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp); |
604 |
< |
if (mres == NULL) |
604 |
> |
if (!mres) |
605 |
|
return(NULL); |
606 |
|
i = rmx_newtype(m1->dtype, m2->dtype); |
607 |
|
if (i) |
626 |
|
int zeroDivides = 0; |
627 |
|
int i, j, k; |
628 |
|
|
629 |
< |
if ((m1 == NULL) | (m2 == NULL) || |
518 |
< |
(m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
629 |
> |
if (!m1 | !m2 || (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
630 |
|
return(0); |
631 |
|
if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp)) |
632 |
|
return(0); |
669 |
|
rmx_lval(m1,i,j,k) *= rmx_lval(m2,i,j,k); |
670 |
|
} |
671 |
|
if (zeroDivides) { |
672 |
< |
fputs("Divide by zero in rmx_elemult()\n", stderr); |
672 |
> |
rmx_addinfo(m1, "WARNING: zero divide(s) corrupted results\n"); |
673 |
|
errno = ERANGE; |
674 |
|
} |
675 |
|
return(1); |
682 |
|
double *mysf = NULL; |
683 |
|
int i, j, k; |
684 |
|
|
685 |
< |
if ((msum == NULL) | (madd == NULL) || |
685 |
> |
if (!msum | !madd || |
686 |
|
(msum->nrows != madd->nrows) | |
687 |
|
(msum->ncols != madd->ncols) | |
688 |
|
(msum->ncomp != madd->ncomp)) |
689 |
|
return(0); |
690 |
< |
if (sf == NULL) { |
690 |
> |
if (!sf) { |
691 |
|
mysf = (double *)malloc(sizeof(double)*msum->ncomp); |
692 |
< |
if (mysf == NULL) |
692 |
> |
if (!mysf) |
693 |
|
return(0); |
694 |
|
for (k = msum->ncomp; k--; ) |
695 |
|
mysf[k] = 1; |
704 |
|
for (j = msum->ncols; j--; ) |
705 |
|
for (k = msum->ncomp; k--; ) |
706 |
|
rmx_lval(msum,i,j,k) += sf[k] * rmx_lval(madd,i,j,k); |
707 |
< |
|
708 |
< |
free(mysf); |
707 |
> |
if (mysf) |
708 |
> |
free(mysf); |
709 |
|
return(1); |
710 |
|
} |
711 |
|
|
715 |
|
{ |
716 |
|
int i, j, k; |
717 |
|
|
718 |
< |
if ((rm == NULL) | (sf == NULL)) |
718 |
> |
if (!rm | !sf) |
719 |
|
return(0); |
720 |
|
for (i = rm->nrows; i--; ) |
721 |
|
for (j = rm->ncols; j--; ) |
734 |
|
int i, j, ks, kd; |
735 |
|
RMATRIX *dnew; |
736 |
|
|
737 |
< |
if ((msrc == NULL) | (n <= 0) | (cmat == NULL)) |
737 |
> |
if (!msrc | (n <= 0) | !cmat) |
738 |
|
return(NULL); |
739 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
740 |
< |
if (dnew == NULL) |
740 |
> |
if (!dnew) |
741 |
|
return(NULL); |
742 |
|
if (msrc->info) { |
743 |
|
char buf[128]; |
744 |
< |
sprintf(buf, "Applied %dx%d matrix transform\n", |
744 |
> |
sprintf(buf, "Applied %dx%d component transform\n", |
745 |
|
dnew->ncomp, msrc->ncomp); |
746 |
|
rmx_addinfo(dnew, msrc->info); |
747 |
|
rmx_addinfo(dnew, buf); |
765 |
|
int i, j; |
766 |
|
RMATRIX *dnew; |
767 |
|
|
768 |
< |
if (cm == NULL) |
768 |
> |
if (!cm) |
769 |
|
return(NULL); |
770 |
|
dnew = rmx_alloc(cm->nrows, cm->ncols, 3); |
771 |
< |
if (dnew == NULL) |
771 |
> |
if (!dnew) |
772 |
|
return(NULL); |
773 |
|
dnew->dtype = DTfloat; |
774 |
|
for (i = dnew->nrows; i--; ) |
788 |
|
int i, j; |
789 |
|
CMATRIX *cnew; |
790 |
|
|
791 |
< |
if (rm == NULL || rm->ncomp != 3) |
791 |
> |
if (!rm || rm->ncomp != 3) |
792 |
|
return(NULL); |
793 |
|
cnew = cm_alloc(rm->nrows, rm->ncols); |
794 |
< |
if (cnew == NULL) |
794 |
> |
if (!cnew) |
795 |
|
return(NULL); |
796 |
|
for (i = cnew->nrows; i--; ) |
797 |
|
for (j = cnew->ncols; j--; ) { |