338 |
|
static int |
339 |
|
rmx_write_rgbe(const RMATRIX *rm, FILE *fp) |
340 |
|
{ |
341 |
< |
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
341 |
> |
COLR *scan = (COLR *)malloc(sizeof(COLR)*rm->ncols); |
342 |
|
int i, j; |
343 |
|
|
344 |
|
if (scan == NULL) |
345 |
|
return(0); |
346 |
|
for (i = 0; i < rm->nrows; i++) { |
347 |
|
for (j = rm->ncols; j--; ) |
348 |
< |
setcolor(scan[j], rmx_lval(rm,i,j,0), |
348 |
> |
setcolr(scan[j], rmx_lval(rm,i,j,0), |
349 |
|
rmx_lval(rm,i,j,1), |
350 |
|
rmx_lval(rm,i,j,2) ); |
351 |
< |
if (fwritescan(scan, rm->ncols, fp) < 0) { |
351 |
> |
if (fwritecolrs(scan, rm->ncols, fp) < 0) { |
352 |
|
free(scan); |
353 |
|
return(0); |
354 |
|
} |
611 |
|
for (k = rm->ncomp; k--; ) |
612 |
|
rmx_lval(rm,i,j,k) *= sf[k]; |
613 |
|
|
614 |
+ |
if (rm->info) |
615 |
+ |
rmx_addinfo(rm, "Applied scalar\n"); |
616 |
|
return(1); |
617 |
|
} |
618 |
|
|
628 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
629 |
|
if (dnew == NULL) |
630 |
|
return(NULL); |
631 |
+ |
if (msrc->info) { |
632 |
+ |
char buf[128]; |
633 |
+ |
sprintf(buf, "Applied %dx%d matrix transform\n", |
634 |
+ |
dnew->ncomp, msrc->ncomp); |
635 |
+ |
rmx_addinfo(dnew, msrc->info); |
636 |
+ |
rmx_addinfo(dnew, buf); |
637 |
+ |
} |
638 |
|
dnew->dtype = msrc->dtype; |
639 |
|
for (i = dnew->nrows; i--; ) |
640 |
|
for (j = dnew->ncols; j--; ) |