9 |
|
#include <stdlib.h> |
10 |
|
#include <string.h> |
11 |
|
#include <fcntl.h> |
12 |
+ |
#include <errno.h> |
13 |
+ |
#include "rtio.h" |
14 |
+ |
#include "platform.h" |
15 |
|
#include "resolu.h" |
16 |
+ |
#include "paths.h" |
17 |
|
#include "rmatrix.h" |
18 |
|
|
19 |
|
static char rmx_mismatch_warn[] = "WARNING: data type mismatch\n"; |
28 |
|
return(NULL); |
29 |
|
dnew = (RMATRIX *)malloc(sizeof(RMATRIX)-sizeof(dnew->mtx) + |
30 |
|
sizeof(dnew->mtx[0])*(n*nr*nc)); |
31 |
< |
if (dnew == NULL) |
31 |
> |
if (!dnew) |
32 |
|
return(NULL); |
33 |
|
dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n; |
34 |
|
dnew->dtype = DTdouble; |
50 |
|
int |
51 |
|
rmx_newtype(int dtyp1, int dtyp2) |
52 |
|
{ |
53 |
< |
if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) && dtyp1 != dtyp2) |
53 |
> |
if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) | |
54 |
> |
(dtyp2==DTxyze) | (dtyp2==DTrgbe) |
55 |
> |
&& dtyp1 != dtyp2) |
56 |
|
return(0); |
57 |
|
if (dtyp1 < dtyp2) |
58 |
|
return(dtyp1); |
63 |
|
int |
64 |
|
rmx_addinfo(RMATRIX *rm, const char *info) |
65 |
|
{ |
66 |
< |
if (!info || !*info) |
66 |
> |
if (!rm || !info || !*info) |
67 |
|
return(0); |
68 |
|
if (!rm->info) { |
69 |
|
rm->info = (char *)malloc(strlen(info)+1); |
81 |
|
get_dminfo(char *s, void *p) |
82 |
|
{ |
83 |
|
RMATRIX *ip = (RMATRIX *)p; |
84 |
< |
char fmt[64]; |
84 |
> |
char fmt[MAXFMTLEN]; |
85 |
|
int i; |
86 |
|
|
87 |
|
if (headidval(fmt, s)) |
114 |
|
rmx_load_ascii(RMATRIX *rm, FILE *fp) |
115 |
|
{ |
116 |
|
int i, j, k; |
117 |
< |
#ifdef _WIN32 |
112 |
< |
_setmode(fileno(fp), _O_TEXT); |
113 |
< |
#endif |
117 |
> |
|
118 |
|
for (i = 0; i < rm->nrows; i++) |
119 |
|
for (j = 0; j < rm->ncols; j++) |
120 |
|
for (k = 0; k < rm->ncomp; k++) |
135 |
|
} |
136 |
|
for (i = 0; i < rm->nrows; i++) |
137 |
|
for (j = 0; j < rm->ncols; j++) { |
138 |
< |
if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
138 |
> |
if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
139 |
|
return(0); |
140 |
|
for (k = rm->ncomp; k--; ) |
141 |
|
rmx_lval(rm,i,j,k) = val[k]; |
146 |
|
static int |
147 |
|
rmx_load_double(RMATRIX *rm, FILE *fp) |
148 |
|
{ |
149 |
< |
int i, j, k; |
146 |
< |
double val[100]; |
149 |
> |
int i, j; |
150 |
|
|
148 |
– |
if (rm->ncomp > 100) { |
149 |
– |
fputs("Unsupported # components in rmx_load_double()\n", stderr); |
150 |
– |
exit(1); |
151 |
– |
} |
151 |
|
for (i = 0; i < rm->nrows; i++) |
152 |
< |
for (j = 0; j < rm->ncols; j++) { |
153 |
< |
if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
152 |
> |
for (j = 0; j < rm->ncols; j++) |
153 |
> |
if (getbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp) |
154 |
|
return(0); |
156 |
– |
for (k = rm->ncomp; k--; ) |
157 |
– |
rmx_lval(rm,i,j,k) = val[k]; |
158 |
– |
} |
155 |
|
return(1); |
156 |
|
} |
157 |
|
|
161 |
|
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
162 |
|
int i, j; |
163 |
|
|
164 |
< |
if (scan == NULL) |
164 |
> |
if (!scan) |
165 |
|
return(0); |
166 |
|
for (i = 0; i < rm->nrows; i++) { |
167 |
|
if (freadscan(scan, rm->ncols, fp) < 0) { |
180 |
|
|
181 |
|
/* Load matrix from supported file type */ |
182 |
|
RMATRIX * |
183 |
< |
rmx_load(const char *fname) |
183 |
> |
rmx_load(const char *inspec) |
184 |
|
{ |
185 |
|
FILE *fp = stdin; |
186 |
|
RMATRIX dinfo; |
187 |
|
RMATRIX *dnew; |
188 |
|
|
189 |
< |
if (fname == NULL) { /* reading from stdin? */ |
190 |
< |
fname = "<stdin>"; |
191 |
< |
#ifdef _WIN32 |
192 |
< |
_setmode(fileno(stdin), _O_BINARY); |
193 |
< |
#endif |
189 |
> |
if (!inspec) { /* reading from stdin? */ |
190 |
> |
inspec = "<stdin>"; |
191 |
> |
SET_FILE_BINARY(stdin); |
192 |
> |
} else if (inspec[0] == '!') { |
193 |
> |
if (!(fp = popen(inspec+1, "r"))) |
194 |
> |
return(NULL); |
195 |
> |
SET_FILE_BINARY(stdin); |
196 |
|
} else { |
197 |
< |
const char *sp = fname; /* check suffix */ |
197 |
> |
const char *sp = inspec; /* check suffix */ |
198 |
|
while (*sp) |
199 |
|
++sp; |
200 |
< |
while (sp > fname && sp[-1] != '.') |
200 |
> |
while (sp > inspec && sp[-1] != '.') |
201 |
|
--sp; |
202 |
|
if (!strcasecmp(sp, "XML")) { /* assume it's a BSDF */ |
203 |
< |
CMATRIX *cm = cm_loadBTDF((char *)fname); |
204 |
< |
if (cm == NULL) |
203 |
> |
CMATRIX *cm = cm_loadBTDF((char *)inspec); |
204 |
> |
if (!cm) |
205 |
|
return(NULL); |
206 |
|
dnew = rmx_from_cmatrix(cm); |
207 |
|
cm_free(cm); |
208 |
+ |
dnew->dtype = DTascii; |
209 |
|
return(dnew); |
210 |
|
} |
211 |
|
/* else open it ourselves */ |
212 |
< |
if ((fp = fopen(fname, "rb")) == NULL) |
212 |
> |
if (!(fp = fopen(inspec, "rb"))) |
213 |
|
return(NULL); |
214 |
|
} |
215 |
|
#ifdef getc_unlocked |
236 |
|
} |
237 |
|
} |
238 |
|
dnew = rmx_alloc(dinfo.nrows, dinfo.ncols, dinfo.ncomp); |
239 |
< |
if (dnew == NULL) { |
239 |
> |
if (!dnew) { |
240 |
|
fclose(fp); |
241 |
|
return(NULL); |
242 |
|
} |
243 |
|
dnew->info = dinfo.info; |
244 |
|
switch (dinfo.dtype) { |
245 |
|
case DTascii: |
246 |
+ |
SET_FILE_TEXT(stdin); |
247 |
|
if (!rmx_load_ascii(dnew, fp)) |
248 |
|
goto loaderr; |
249 |
+ |
dnew->dtype = DTascii; /* should leave double? */ |
250 |
|
break; |
251 |
|
case DTfloat: |
252 |
|
if (!rmx_load_float(dnew, fp)) |
267 |
|
default: |
268 |
|
goto loaderr; |
269 |
|
} |
270 |
< |
if (fp != stdin) |
271 |
< |
fclose(fp); |
270 |
> |
if (fp != stdin) { |
271 |
> |
if (inspec[0] == '!') |
272 |
> |
pclose(fp); |
273 |
> |
else |
274 |
> |
fclose(fp); |
275 |
> |
} |
276 |
> |
#ifdef getc_unlocked |
277 |
> |
else |
278 |
> |
funlockfile(fp); |
279 |
> |
#endif |
280 |
|
return(dnew); |
281 |
|
loaderr: /* should report error? */ |
282 |
< |
fclose(fp); |
282 |
> |
if (inspec[0] == '!') |
283 |
> |
pclose(fp); |
284 |
> |
else |
285 |
> |
fclose(fp); |
286 |
|
rmx_free(dnew); |
287 |
|
return(NULL); |
288 |
|
} |
290 |
|
static int |
291 |
|
rmx_write_ascii(const RMATRIX *rm, FILE *fp) |
292 |
|
{ |
293 |
+ |
const char *fmt = (rm->dtype == DTfloat) ? " %.7e" : |
294 |
+ |
(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) ? " %.3e" : |
295 |
+ |
" %.15e" ; |
296 |
|
int i, j, k; |
297 |
< |
#ifdef _WIN32 |
283 |
< |
_setmode(fileno(fp), _O_TEXT); |
284 |
< |
#endif |
297 |
> |
|
298 |
|
for (i = 0; i < rm->nrows; i++) { |
299 |
|
for (j = 0; j < rm->ncols; j++) { |
300 |
|
for (k = 0; k < rm->ncomp; k++) |
301 |
< |
fprintf(fp, " %.15e", rmx_lval(rm,i,j,k)); |
301 |
> |
fprintf(fp, fmt, rmx_lval(rm,i,j,k)); |
302 |
|
fputc('\t', fp); |
303 |
|
} |
304 |
|
fputc('\n', fp); |
320 |
|
for (j = 0; j < rm->ncols; j++) { |
321 |
|
for (k = rm->ncomp; k--; ) |
322 |
|
val[k] = (float)rmx_lval(rm,i,j,k); |
323 |
< |
if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
323 |
> |
if (putbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
324 |
|
return(0); |
325 |
|
} |
326 |
|
return(1); |
329 |
|
static int |
330 |
|
rmx_write_double(const RMATRIX *rm, FILE *fp) |
331 |
|
{ |
332 |
< |
int i, j, k; |
320 |
< |
double val[100]; |
332 |
> |
int i, j; |
333 |
|
|
322 |
– |
if (rm->ncomp > 100) { |
323 |
– |
fputs("Unsupported # components in rmx_write_double()\n", stderr); |
324 |
– |
exit(1); |
325 |
– |
} |
334 |
|
for (i = 0; i < rm->nrows; i++) |
335 |
< |
for (j = 0; j < rm->ncols; j++) { |
336 |
< |
for (k = rm->ncomp; k--; ) |
329 |
< |
val[k] = rmx_lval(rm,i,j,k); |
330 |
< |
if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
335 |
> |
for (j = 0; j < rm->ncols; j++) |
336 |
> |
if (putbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp) |
337 |
|
return(0); |
332 |
– |
} |
338 |
|
return(1); |
339 |
|
} |
340 |
|
|
341 |
|
static int |
342 |
|
rmx_write_rgbe(const RMATRIX *rm, FILE *fp) |
343 |
|
{ |
344 |
< |
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
344 |
> |
COLR *scan = (COLR *)malloc(sizeof(COLR)*rm->ncols); |
345 |
|
int i, j; |
346 |
|
|
347 |
< |
if (scan == NULL) |
347 |
> |
if (!scan) |
348 |
|
return(0); |
349 |
|
for (i = 0; i < rm->nrows; i++) { |
350 |
|
for (j = rm->ncols; j--; ) |
351 |
< |
setcolor(scan[j], rmx_lval(rm,i,j,0), |
351 |
> |
setcolr(scan[j], rmx_lval(rm,i,j,0), |
352 |
|
rmx_lval(rm,i,j,1), |
353 |
|
rmx_lval(rm,i,j,2) ); |
354 |
< |
if (fwritescan(scan, rm->ncols, fp) < 0) { |
354 |
> |
if (fwritecolrs(scan, rm->ncols, fp) < 0) { |
355 |
|
free(scan); |
356 |
|
return(0); |
357 |
|
} |
361 |
|
} |
362 |
|
|
363 |
|
/* Write matrix to file type indicated by dtype */ |
364 |
< |
long |
364 |
> |
int |
365 |
|
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
366 |
|
{ |
367 |
|
RMATRIX *mydm = NULL; |
368 |
|
int ok = 1; |
369 |
|
|
370 |
< |
if ((rm == NULL) | (fp == NULL)) |
370 |
> |
if (!rm | !fp) |
371 |
|
return(0); |
372 |
+ |
#ifdef getc_unlocked |
373 |
+ |
flockfile(fp); |
374 |
+ |
#endif |
375 |
|
/* complete header */ |
376 |
|
if (rm->info) |
377 |
|
fputs(rm->info, fp); |
379 |
|
dtype = rm->dtype; |
380 |
|
else if ((dtype == DTrgbe) & (rm->dtype == DTxyze)) |
381 |
|
dtype = DTxyze; |
382 |
< |
else if ((dtype = DTxyze) & (rm->dtype == DTrgbe)) |
382 |
> |
else if ((dtype == DTxyze) & (rm->dtype == DTrgbe)) |
383 |
|
dtype = DTrgbe; |
384 |
|
if ((dtype != DTrgbe) & (dtype != DTxyze)) { |
385 |
|
fprintf(fp, "NROWS=%d\n", rm->nrows); |
391 |
|
return(0); |
392 |
|
cmtx[0] = cmtx[1] = cmtx[2] = 1; |
393 |
|
mydm = rmx_transform(rm, 3, cmtx); |
394 |
< |
if (mydm == NULL) |
394 |
> |
if (!mydm) |
395 |
|
return(0); |
396 |
|
rm = mydm; |
397 |
|
} |
416 |
|
return(0); |
417 |
|
} |
418 |
|
ok &= (fflush(fp) == 0); |
419 |
< |
rmx_free(mydm); |
420 |
< |
return(ftell(fp) * ok); /* return # bytes written */ |
419 |
> |
#ifdef getc_unlocked |
420 |
> |
funlockfile(fp); |
421 |
> |
#endif |
422 |
> |
if (mydm) |
423 |
> |
rmx_free(mydm); |
424 |
> |
return(ok); |
425 |
|
} |
426 |
|
|
427 |
|
/* Allocate and assign square identity matrix with n components */ |
429 |
|
rmx_identity(const int dim, const int n) |
430 |
|
{ |
431 |
|
RMATRIX *rid = rmx_alloc(dim, dim, n); |
432 |
< |
int i; |
432 |
> |
int i, k; |
433 |
|
|
434 |
< |
if (rid == NULL) |
434 |
> |
if (!rid) |
435 |
|
return(NULL); |
436 |
< |
memset(rid->mtx, 0, sizeof(rid->mtx[0])*dim*dim); |
436 |
> |
memset(rid->mtx, 0, sizeof(rid->mtx[0])*n*dim*dim); |
437 |
|
for (i = dim; i--; ) |
438 |
< |
rmx_lval(rid,i,i,0) = 1; |
439 |
< |
for (i = n; --i; ) |
428 |
< |
memcpy(rid->mtx+i*(dim*dim), rid->mtx, |
429 |
< |
sizeof(rid->mtx[0])*dim*dim); |
438 |
> |
for (k = n; k--; ) |
439 |
> |
rmx_lval(rid,i,i,k) = 1; |
440 |
|
return(rid); |
441 |
|
} |
442 |
|
|
446 |
|
{ |
447 |
|
RMATRIX *dnew; |
448 |
|
|
449 |
< |
if (rm == NULL) |
449 |
> |
if (!rm) |
450 |
|
return(NULL); |
451 |
|
dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp); |
452 |
< |
if (dnew == NULL) |
452 |
> |
if (!dnew) |
453 |
|
return(NULL); |
454 |
|
rmx_addinfo(dnew, rm->info); |
455 |
|
dnew->dtype = rm->dtype; |
465 |
|
RMATRIX *dnew; |
466 |
|
int i, j, k; |
467 |
|
|
468 |
< |
if (rm == NULL) |
468 |
> |
if (!rm) |
469 |
|
return(0); |
470 |
+ |
if ((rm->nrows == 1) | (rm->ncols == 1)) { |
471 |
+ |
dnew = rmx_copy(rm); |
472 |
+ |
if (!dnew) |
473 |
+ |
return(NULL); |
474 |
+ |
dnew->nrows = rm->ncols; |
475 |
+ |
dnew->ncols = rm->nrows; |
476 |
+ |
return(dnew); |
477 |
+ |
} |
478 |
|
dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp); |
479 |
< |
if (dnew == NULL) |
479 |
> |
if (!dnew) |
480 |
|
return(NULL); |
481 |
|
if (rm->info) { |
482 |
|
rmx_addinfo(dnew, rm->info); |
497 |
|
RMATRIX *mres; |
498 |
|
int i, j, k, h; |
499 |
|
|
500 |
< |
if ((m1 == NULL) | (m2 == NULL) || |
483 |
< |
(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
500 |
> |
if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
501 |
|
return(NULL); |
502 |
|
mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp); |
503 |
< |
if (mres == NULL) |
503 |
> |
if (!mres) |
504 |
|
return(NULL); |
505 |
|
i = rmx_newtype(m1->dtype, m2->dtype); |
506 |
|
if (i) |
512 |
|
for (k = mres->ncomp; k--; ) { |
513 |
|
long double d = 0; |
514 |
|
for (h = m1->ncols; h--; ) |
515 |
< |
d += (long double)rmx_lval(m1,i,h,k) * |
499 |
< |
(long double)rmx_lval(m2,h,j,k); |
515 |
> |
d += rmx_lval(m1,i,h,k) * rmx_lval(m2,h,j,k); |
516 |
|
rmx_lval(mres,i,j,k) = (double)d; |
517 |
|
} |
518 |
|
return(mres); |
519 |
|
} |
520 |
|
|
521 |
+ |
/* Element-wise multiplication (or division) of m2 into m1 */ |
522 |
+ |
int |
523 |
+ |
rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide) |
524 |
+ |
{ |
525 |
+ |
int zeroDivides = 0; |
526 |
+ |
int i, j, k; |
527 |
+ |
|
528 |
+ |
if (!m1 | !m2 || (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
529 |
+ |
return(0); |
530 |
+ |
if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp)) |
531 |
+ |
return(0); |
532 |
+ |
i = rmx_newtype(m1->dtype, m2->dtype); |
533 |
+ |
if (i) |
534 |
+ |
m1->dtype = i; |
535 |
+ |
else |
536 |
+ |
rmx_addinfo(m1, rmx_mismatch_warn); |
537 |
+ |
for (i = m1->nrows; i--; ) |
538 |
+ |
for (j = m1->ncols; j--; ) |
539 |
+ |
if (divide) { |
540 |
+ |
double d; |
541 |
+ |
if (m2->ncomp == 1) { |
542 |
+ |
d = rmx_lval(m2,i,j,0); |
543 |
+ |
if (d == 0) { |
544 |
+ |
++zeroDivides; |
545 |
+ |
for (k = m1->ncomp; k--; ) |
546 |
+ |
rmx_lval(m1,i,j,k) = 0; |
547 |
+ |
} else { |
548 |
+ |
d = 1./d; |
549 |
+ |
for (k = m1->ncomp; k--; ) |
550 |
+ |
rmx_lval(m1,i,j,k) *= d; |
551 |
+ |
} |
552 |
+ |
} else |
553 |
+ |
for (k = m1->ncomp; k--; ) { |
554 |
+ |
d = rmx_lval(m2,i,j,k); |
555 |
+ |
if (d == 0) { |
556 |
+ |
++zeroDivides; |
557 |
+ |
rmx_lval(m1,i,j,k) = 0; |
558 |
+ |
} else |
559 |
+ |
rmx_lval(m1,i,j,k) /= d; |
560 |
+ |
} |
561 |
+ |
} else { |
562 |
+ |
if (m2->ncomp == 1) { |
563 |
+ |
const double d = rmx_lval(m2,i,j,0); |
564 |
+ |
for (k = m1->ncomp; k--; ) |
565 |
+ |
rmx_lval(m1,i,j,k) *= d; |
566 |
+ |
} else |
567 |
+ |
for (k = m1->ncomp; k--; ) |
568 |
+ |
rmx_lval(m1,i,j,k) *= rmx_lval(m2,i,j,k); |
569 |
+ |
} |
570 |
+ |
if (zeroDivides) { |
571 |
+ |
rmx_addinfo(m1, "WARNING: zero divide(s) corrupted results\n"); |
572 |
+ |
errno = ERANGE; |
573 |
+ |
} |
574 |
+ |
return(1); |
575 |
+ |
} |
576 |
+ |
|
577 |
|
/* Sum second matrix into first, applying scale factor beforehand */ |
578 |
|
int |
579 |
|
rmx_sum(RMATRIX *msum, const RMATRIX *madd, const double sf[]) |
581 |
|
double *mysf = NULL; |
582 |
|
int i, j, k; |
583 |
|
|
584 |
< |
if ((msum == NULL) | (madd == NULL) || |
584 |
> |
if (!msum | !madd || |
585 |
|
(msum->nrows != madd->nrows) | |
586 |
|
(msum->ncols != madd->ncols) | |
587 |
|
(msum->ncomp != madd->ncomp)) |
588 |
|
return(0); |
589 |
< |
if (sf == NULL) { |
589 |
> |
if (!sf) { |
590 |
|
mysf = (double *)malloc(sizeof(double)*msum->ncomp); |
591 |
< |
if (mysf == NULL) |
591 |
> |
if (!mysf) |
592 |
|
return(0); |
593 |
|
for (k = msum->ncomp; k--; ) |
594 |
|
mysf[k] = 1; |
603 |
|
for (j = msum->ncols; j--; ) |
604 |
|
for (k = msum->ncomp; k--; ) |
605 |
|
rmx_lval(msum,i,j,k) += sf[k] * rmx_lval(madd,i,j,k); |
606 |
< |
|
607 |
< |
free(mysf); |
606 |
> |
if (mysf) |
607 |
> |
free(mysf); |
608 |
|
return(1); |
609 |
|
} |
610 |
|
|
614 |
|
{ |
615 |
|
int i, j, k; |
616 |
|
|
617 |
< |
if ((rm == NULL) | (sf == NULL)) |
617 |
> |
if (!rm | !sf) |
618 |
|
return(0); |
619 |
|
for (i = rm->nrows; i--; ) |
620 |
|
for (j = rm->ncols; j--; ) |
621 |
|
for (k = rm->ncomp; k--; ) |
622 |
|
rmx_lval(rm,i,j,k) *= sf[k]; |
623 |
|
|
624 |
+ |
if (rm->info) |
625 |
+ |
rmx_addinfo(rm, "Applied scalar\n"); |
626 |
|
return(1); |
627 |
|
} |
628 |
|
|
633 |
|
int i, j, ks, kd; |
634 |
|
RMATRIX *dnew; |
635 |
|
|
636 |
< |
if ((msrc == NULL) | (n <= 0) | (cmat == NULL)) |
636 |
> |
if (!msrc | (n <= 0) | !cmat) |
637 |
|
return(NULL); |
638 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
639 |
< |
if (dnew == NULL) |
639 |
> |
if (!dnew) |
640 |
|
return(NULL); |
641 |
+ |
if (msrc->info) { |
642 |
+ |
char buf[128]; |
643 |
+ |
sprintf(buf, "Applied %dx%d matrix transform\n", |
644 |
+ |
dnew->ncomp, msrc->ncomp); |
645 |
+ |
rmx_addinfo(dnew, msrc->info); |
646 |
+ |
rmx_addinfo(dnew, buf); |
647 |
+ |
} |
648 |
|
dnew->dtype = msrc->dtype; |
649 |
|
for (i = dnew->nrows; i--; ) |
650 |
|
for (j = dnew->ncols; j--; ) |
664 |
|
int i, j; |
665 |
|
RMATRIX *dnew; |
666 |
|
|
667 |
< |
if (cm == NULL) |
667 |
> |
if (!cm) |
668 |
|
return(NULL); |
669 |
|
dnew = rmx_alloc(cm->nrows, cm->ncols, 3); |
670 |
< |
if (dnew == NULL) |
670 |
> |
if (!dnew) |
671 |
|
return(NULL); |
672 |
|
dnew->dtype = DTfloat; |
673 |
|
for (i = dnew->nrows; i--; ) |
687 |
|
int i, j; |
688 |
|
CMATRIX *cnew; |
689 |
|
|
690 |
< |
if (rm == NULL || rm->ncomp != 3) |
690 |
> |
if (!rm || rm->ncomp != 3) |
691 |
|
return(NULL); |
692 |
|
cnew = cm_alloc(rm->nrows, rm->ncols); |
693 |
< |
if (cnew == NULL) |
693 |
> |
if (!cnew) |
694 |
|
return(NULL); |
695 |
|
for (i = cnew->nrows; i--; ) |
696 |
|
for (j = cnew->ncols; j--; ) { |