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 |
+ |
#if !defined(_WIN32) && !defined(_WIN64) |
16 |
+ |
#include <sys/mman.h> |
17 |
+ |
#endif |
18 |
|
|
19 |
< |
static char rmx_mismatch_warn[] = "WARNING: data type mismatch\n"; |
19 |
> |
static const 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_alloc(int nr, int nc, int n) |
26 |
> |
rmx_new(int nr, int nc, int n) |
27 |
|
{ |
28 |
|
RMATRIX *dnew; |
29 |
|
|
30 |
< |
if ((nr <= 0) | (nc <= 0) | (n <= 0)) |
30 |
> |
if (n <= 0) |
31 |
|
return(NULL); |
32 |
< |
dnew = (RMATRIX *)malloc(sizeof(RMATRIX)-sizeof(dnew->mtx) + |
33 |
< |
sizeof(dnew->mtx[0])*(n*nr*nc)); |
34 |
< |
if (dnew == NULL) |
35 |
< |
return(NULL); |
36 |
< |
dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n; |
37 |
< |
dnew->dtype = DTdouble; |
38 |
< |
dnew->info = NULL; |
32 |
> |
|
33 |
> |
dnew = (RMATRIX *)calloc(1, sizeof(RMATRIX)); |
34 |
> |
if (dnew) { |
35 |
> |
dnew->dtype = DTdouble; |
36 |
> |
dnew->nrows = nr; |
37 |
> |
dnew->ncols = nc; |
38 |
> |
dnew->ncomp = n; |
39 |
> |
setcolor(dnew->cexp, 1.f, 1.f, 1.f); |
40 |
> |
memcpy(dnew->wlpart, WLPART, sizeof(dnew->wlpart)); |
41 |
> |
} |
42 |
|
return(dnew); |
43 |
|
} |
44 |
|
|
45 |
+ |
/* Prepare a RMATRIX for writing (allocate array if needed) */ |
46 |
+ |
int |
47 |
+ |
rmx_prepare(RMATRIX *rm) |
48 |
+ |
{ |
49 |
+ |
if (!rm) return(0); |
50 |
+ |
if (rm->mtx) |
51 |
+ |
return(1); |
52 |
+ |
if ((rm->nrows <= 0) | (rm->ncols <= 0) | (rm->ncomp <= 0)) |
53 |
+ |
return(0); |
54 |
+ |
rm->mtx = (double *)malloc(array_size(rm)); |
55 |
+ |
return(rm->mtx != NULL); |
56 |
+ |
} |
57 |
+ |
|
58 |
+ |
/* Call rmx_new() and rmx_prepare() */ |
59 |
+ |
RMATRIX * |
60 |
+ |
rmx_alloc(int nr, int nc, int n) |
61 |
+ |
{ |
62 |
+ |
RMATRIX *dnew = rmx_new(nr, nc, n); |
63 |
+ |
|
64 |
+ |
if (dnew && !rmx_prepare(dnew)) { |
65 |
+ |
rmx_free(dnew); |
66 |
+ |
dnew = NULL; |
67 |
+ |
} |
68 |
+ |
return(dnew); |
69 |
+ |
} |
70 |
+ |
|
71 |
|
/* Free a RMATRIX array */ |
72 |
|
void |
73 |
|
rmx_free(RMATRIX *rm) |
75 |
|
if (!rm) return; |
76 |
|
if (rm->info) |
77 |
|
free(rm->info); |
78 |
+ |
#ifdef MAP_FILE |
79 |
+ |
if (rm->mapped) |
80 |
+ |
munmap(rm->mapped, mapped_size(rm)); |
81 |
+ |
else |
82 |
+ |
#endif |
83 |
+ |
free(rm->mtx); |
84 |
|
free(rm); |
85 |
|
} |
86 |
|
|
88 |
|
int |
89 |
|
rmx_newtype(int dtyp1, int dtyp2) |
90 |
|
{ |
91 |
< |
if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) | |
92 |
< |
(dtyp2==DTxyze) | (dtyp2==DTrgbe) |
91 |
> |
if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) | (dtyp1==DTspec) | |
92 |
> |
(dtyp2==DTxyze) | (dtyp2==DTrgbe) | (dtyp2==DTspec) |
93 |
|
&& dtyp1 != dtyp2) |
94 |
|
return(0); |
95 |
|
if (dtyp1 < dtyp2) |
101 |
|
int |
102 |
|
rmx_addinfo(RMATRIX *rm, const char *info) |
103 |
|
{ |
104 |
< |
if (!info || !*info) |
104 |
> |
int oldlen = 0; |
105 |
> |
|
106 |
> |
if (!rm || !info || !*info) |
107 |
|
return(0); |
108 |
|
if (!rm->info) { |
109 |
|
rm->info = (char *)malloc(strlen(info)+1); |
110 |
|
if (rm->info) rm->info[0] = '\0'; |
111 |
< |
} else |
111 |
> |
} else { |
112 |
> |
oldlen = strlen(rm->info); |
113 |
|
rm->info = (char *)realloc(rm->info, |
114 |
< |
strlen(rm->info)+strlen(info)+1); |
114 |
> |
oldlen+strlen(info)+1); |
115 |
> |
} |
116 |
|
if (!rm->info) |
117 |
|
return(0); |
118 |
< |
strcat(rm->info, info); |
118 |
> |
strcpy(rm->info+oldlen, info); |
119 |
|
return(1); |
120 |
|
} |
121 |
|
|
123 |
|
get_dminfo(char *s, void *p) |
124 |
|
{ |
125 |
|
RMATRIX *ip = (RMATRIX *)p; |
126 |
< |
char fmt[64]; |
126 |
> |
char fmt[MAXFMTLEN]; |
127 |
|
int i; |
128 |
|
|
129 |
< |
if (headidval(fmt, s)) |
129 |
> |
if (headidval(NULL, s)) |
130 |
|
return(0); |
131 |
< |
if (!strncmp(s, "NCOMP=", 6)) { |
132 |
< |
ip->ncomp = atoi(s+6); |
131 |
> |
if (isncomp(s)) { |
132 |
> |
ip->ncomp = ncompval(s); |
133 |
|
return(0); |
134 |
|
} |
135 |
|
if (!strncmp(s, "NROWS=", 6)) { |
140 |
|
ip->ncols = atoi(s+6); |
141 |
|
return(0); |
142 |
|
} |
143 |
+ |
if ((i = isbigendian(s)) >= 0) { |
144 |
+ |
ip->swapin = (nativebigendian() != i); |
145 |
+ |
return(0); |
146 |
+ |
} |
147 |
+ |
if (isexpos(s)) { |
148 |
+ |
float f = exposval(s); |
149 |
+ |
scalecolor(ip->cexp, f); |
150 |
+ |
return(0); |
151 |
+ |
} |
152 |
+ |
if (iscolcor(s)) { |
153 |
+ |
COLOR ctmp; |
154 |
+ |
colcorval(ctmp, s); |
155 |
+ |
multcolor(ip->cexp, ctmp); |
156 |
+ |
return(0); |
157 |
+ |
} |
158 |
+ |
if (iswlsplit(s)) { |
159 |
+ |
wlsplitval(ip->wlpart, s); |
160 |
+ |
return(0); |
161 |
+ |
} |
162 |
|
if (!formatval(fmt, s)) { |
163 |
|
rmx_addinfo(ip, s); |
164 |
|
return(0); |
165 |
< |
} |
165 |
> |
} /* else check format */ |
166 |
|
for (i = 1; i < DTend; i++) |
167 |
|
if (!strcmp(fmt, cm_fmt_id[i])) { |
168 |
|
ip->dtype = i; |
176 |
|
{ |
177 |
|
int i, j, k; |
178 |
|
|
179 |
+ |
if (!rmx_prepare(rm)) |
180 |
+ |
return(0); |
181 |
|
for (i = 0; i < rm->nrows; i++) |
182 |
< |
for (j = 0; j < rm->ncols; j++) |
182 |
> |
for (j = 0; j < rm->ncols; j++) { |
183 |
> |
double *dp = rmx_lval(rm,i,j); |
184 |
|
for (k = 0; k < rm->ncomp; k++) |
185 |
< |
if (fscanf(fp, "%lf", &rmx_lval(rm,i,j,k)) != 1) |
185 |
> |
if (fscanf(fp, "%lf", &dp[k]) != 1) |
186 |
|
return(0); |
187 |
+ |
} |
188 |
|
return(1); |
189 |
|
} |
190 |
|
|
198 |
|
fputs("Unsupported # components in rmx_load_float()\n", stderr); |
199 |
|
exit(1); |
200 |
|
} |
201 |
+ |
if (!rmx_prepare(rm)) |
202 |
+ |
return(0); |
203 |
|
for (i = 0; i < rm->nrows; i++) |
204 |
|
for (j = 0; j < rm->ncols; j++) { |
205 |
< |
if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
205 |
> |
double *dp = rmx_lval(rm,i,j); |
206 |
> |
if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
207 |
|
return(0); |
208 |
+ |
if (rm->swapin) |
209 |
+ |
swap32((char *)val, rm->ncomp); |
210 |
|
for (k = rm->ncomp; k--; ) |
211 |
< |
rmx_lval(rm,i,j,k) = val[k]; |
211 |
> |
dp[k] = val[k]; |
212 |
|
} |
213 |
|
return(1); |
214 |
|
} |
216 |
|
static int |
217 |
|
rmx_load_double(RMATRIX *rm, FILE *fp) |
218 |
|
{ |
219 |
< |
int i, j, k; |
220 |
< |
double val[100]; |
221 |
< |
|
222 |
< |
if (rm->ncomp > 100) { |
223 |
< |
fputs("Unsupported # components in rmx_load_double()\n", stderr); |
224 |
< |
exit(1); |
219 |
> |
int i; |
220 |
> |
#ifdef MAP_FILE |
221 |
> |
long pos; /* map memory for file > 1MB if possible */ |
222 |
> |
if (!rm->swapin && array_size(rm) >= 1L<<20 && |
223 |
> |
(pos = ftell(fp)) >= 0 && !(pos % sizeof(double))) { |
224 |
> |
rm->mapped = mmap(NULL, array_size(rm)+pos, PROT_READ|PROT_WRITE, |
225 |
> |
MAP_PRIVATE, fileno(fp), 0); |
226 |
> |
if (rm->mapped != MAP_FAILED) { |
227 |
> |
rm->mtx = (double *)rm->mapped + pos/sizeof(double); |
228 |
> |
return(1); |
229 |
> |
} /* else fall back on reading into memory */ |
230 |
> |
rm->mapped = NULL; |
231 |
|
} |
232 |
< |
for (i = 0; i < rm->nrows; i++) |
233 |
< |
for (j = 0; j < rm->ncols; j++) { |
234 |
< |
if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
235 |
< |
return(0); |
236 |
< |
for (k = rm->ncomp; k--; ) |
237 |
< |
rmx_lval(rm,i,j,k) = val[k]; |
238 |
< |
} |
232 |
> |
#endif |
233 |
> |
if (!rmx_prepare(rm)) |
234 |
> |
return(0); |
235 |
> |
for (i = 0; i < rm->nrows; i++) { |
236 |
> |
if (getbinary(rmx_lval(rm,i,0), sizeof(double)*rm->ncomp, |
237 |
> |
rm->ncols, fp) != rm->ncols) |
238 |
> |
return(0); |
239 |
> |
if (rm->swapin) |
240 |
> |
swap64((char *)rmx_lval(rm,i,0), rm->ncols*rm->ncomp); |
241 |
> |
} |
242 |
|
return(1); |
243 |
|
} |
244 |
|
|
248 |
|
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
249 |
|
int i, j; |
250 |
|
|
251 |
< |
if (scan == NULL) |
251 |
> |
if (!scan) |
252 |
|
return(0); |
253 |
+ |
if (!rmx_prepare(rm)) { |
254 |
+ |
free(scan); |
255 |
+ |
return(0); |
256 |
+ |
} |
257 |
|
for (i = 0; i < rm->nrows; i++) { |
258 |
+ |
double *dp = rmx_lval(rm,i,0); |
259 |
|
if (freadscan(scan, rm->ncols, fp) < 0) { |
260 |
|
free(scan); |
261 |
|
return(0); |
262 |
|
} |
263 |
< |
for (j = rm->ncols; j--; ) { |
264 |
< |
rmx_lval(rm,i,j,0) = colval(scan[j],RED); |
265 |
< |
rmx_lval(rm,i,j,1) = colval(scan[j],GRN); |
266 |
< |
rmx_lval(rm,i,j,2) = colval(scan[j],BLU); |
263 |
> |
for (j = 0; j < rm->ncols; j++, dp += 3) { |
264 |
> |
dp[0] = colval(scan[j],RED); |
265 |
> |
dp[1] = colval(scan[j],GRN); |
266 |
> |
dp[2] = colval(scan[j],BLU); |
267 |
|
} |
268 |
|
} |
269 |
|
free(scan); |
270 |
|
return(1); |
271 |
|
} |
272 |
|
|
273 |
+ |
static int |
274 |
+ |
rmx_load_spec(RMATRIX *rm, FILE *fp) |
275 |
+ |
{ |
276 |
+ |
uby8 *scan; |
277 |
+ |
SCOLOR scol; |
278 |
+ |
int i, j, k; |
279 |
+ |
|
280 |
+ |
if (rm->ncomp < 3) |
281 |
+ |
return(0); |
282 |
+ |
scan = (uby8 *)malloc((rm->ncomp+1)*rm->ncols); |
283 |
+ |
if (!scan) |
284 |
+ |
return(0); |
285 |
+ |
if (!rmx_prepare(rm)) { |
286 |
+ |
free(scan); |
287 |
+ |
return(0); |
288 |
+ |
} |
289 |
+ |
for (i = 0; i < rm->nrows; i++) { |
290 |
+ |
double *dp = rmx_lval(rm,i,0); |
291 |
+ |
if (freadscolrs(scan, rm->ncomp, rm->ncols, fp) < 0) { |
292 |
+ |
free(scan); |
293 |
+ |
return(0); |
294 |
+ |
} |
295 |
+ |
for (j = 0; j < rm->ncols; j++) { |
296 |
+ |
scolr2scolor(scol, scan+j*(rm->ncomp+1), rm->ncomp); |
297 |
+ |
for (k = 0; k < rm->ncomp; k++) |
298 |
+ |
*dp++ = scol[k]; |
299 |
+ |
} |
300 |
+ |
} |
301 |
+ |
free(scan); |
302 |
+ |
return(1); |
303 |
+ |
} |
304 |
+ |
|
305 |
|
/* Load matrix from supported file type */ |
306 |
|
RMATRIX * |
307 |
< |
rmx_load(const char *inspec) |
307 |
> |
rmx_load(const char *inspec, RMPref rmp) |
308 |
|
{ |
309 |
< |
FILE *fp = stdin; |
192 |
< |
RMATRIX dinfo; |
309 |
> |
FILE *fp; |
310 |
|
RMATRIX *dnew; |
311 |
|
|
312 |
< |
if (inspec == NULL) { /* reading from stdin? */ |
313 |
< |
inspec = "<stdin>"; |
314 |
< |
#if defined(_WIN32) || defined(_WIN64) |
315 |
< |
_setmode(fileno(stdin), _O_BINARY); |
316 |
< |
#endif |
312 |
> |
if (!inspec) |
313 |
> |
inspec = stdin_name; |
314 |
> |
else if (!*inspec) |
315 |
> |
return(NULL); |
316 |
> |
if (inspec == stdin_name) { /* reading from stdin? */ |
317 |
> |
fp = stdin; |
318 |
|
} else if (inspec[0] == '!') { |
319 |
< |
if ((fp = popen(inspec+1, "r")) == NULL) |
319 |
> |
if (!(fp = popen(inspec+1, "r"))) |
320 |
|
return(NULL); |
203 |
– |
#if defined(_WIN32) || defined(_WIN64) |
204 |
– |
_setmode(fileno(fp), _O_BINARY); |
205 |
– |
#endif |
321 |
|
} else { |
322 |
|
const char *sp = inspec; /* check suffix */ |
323 |
|
while (*sp) |
325 |
|
while (sp > inspec && sp[-1] != '.') |
326 |
|
--sp; |
327 |
|
if (!strcasecmp(sp, "XML")) { /* assume it's a BSDF */ |
328 |
< |
CMATRIX *cm = cm_loadBTDF((char *)inspec); |
329 |
< |
if (cm == NULL) |
328 |
> |
CMATRIX *cm = rmp==RMPtrans ? cm_loadBTDF(inspec) : |
329 |
> |
cm_loadBRDF(inspec, rmp==RMPreflB) ; |
330 |
> |
if (!cm) |
331 |
|
return(NULL); |
332 |
|
dnew = rmx_from_cmatrix(cm); |
333 |
|
cm_free(cm); |
335 |
|
return(dnew); |
336 |
|
} |
337 |
|
/* else open it ourselves */ |
338 |
< |
if ((fp = fopen(inspec, "rb")) == NULL) |
338 |
> |
if (!(fp = fopen(inspec, "r"))) |
339 |
|
return(NULL); |
340 |
|
} |
341 |
+ |
SET_FILE_BINARY(fp); |
342 |
|
#ifdef getc_unlocked |
343 |
|
flockfile(fp); |
344 |
|
#endif |
345 |
< |
dinfo.nrows = dinfo.ncols = dinfo.ncomp = 0; |
229 |
< |
dinfo.dtype = DTascii; /* assumed w/o FORMAT */ |
230 |
< |
dinfo.info = NULL; |
231 |
< |
if (getheader(fp, get_dminfo, &dinfo) < 0) { |
345 |
> |
if (!(dnew = rmx_new(0,0,3))) { |
346 |
|
fclose(fp); |
347 |
|
return(NULL); |
348 |
|
} |
349 |
< |
if ((dinfo.nrows <= 0) | (dinfo.ncols <= 0)) { |
350 |
< |
if (!fscnresolu(&dinfo.ncols, &dinfo.nrows, fp)) { |
349 |
> |
dnew->dtype = DTascii; /* assumed w/o FORMAT */ |
350 |
> |
if (getheader(fp, get_dminfo, dnew) < 0) { |
351 |
> |
fclose(fp); |
352 |
> |
return(NULL); |
353 |
> |
} |
354 |
> |
if ((dnew->nrows <= 0) | (dnew->ncols <= 0)) { |
355 |
> |
if (!fscnresolu(&dnew->ncols, &dnew->nrows, fp)) { |
356 |
|
fclose(fp); |
357 |
|
return(NULL); |
358 |
|
} |
359 |
< |
if (dinfo.ncomp <= 0) |
360 |
< |
dinfo.ncomp = 3; |
242 |
< |
else if ((dinfo.dtype == DTrgbe) | (dinfo.dtype == DTxyze) && |
243 |
< |
dinfo.ncomp != 3) { |
359 |
> |
if ((dnew->dtype == DTrgbe) | (dnew->dtype == DTxyze) && |
360 |
> |
dnew->ncomp != 3) { |
361 |
|
fclose(fp); |
362 |
|
return(NULL); |
363 |
|
} |
364 |
|
} |
365 |
< |
dnew = rmx_alloc(dinfo.nrows, dinfo.ncols, dinfo.ncomp); |
249 |
< |
if (dnew == NULL) { |
250 |
< |
fclose(fp); |
251 |
< |
return(NULL); |
252 |
< |
} |
253 |
< |
dnew->info = dinfo.info; |
254 |
< |
switch (dinfo.dtype) { |
365 |
> |
switch (dnew->dtype) { |
366 |
|
case DTascii: |
367 |
< |
#if defined(_WIN32) || defined(_WIN64) |
257 |
< |
_setmode(fileno(fp), _O_TEXT); |
258 |
< |
#endif |
367 |
> |
SET_FILE_TEXT(fp); |
368 |
|
if (!rmx_load_ascii(dnew, fp)) |
369 |
|
goto loaderr; |
370 |
|
dnew->dtype = DTascii; /* should leave double? */ |
383 |
|
case DTxyze: |
384 |
|
if (!rmx_load_rgbe(dnew, fp)) |
385 |
|
goto loaderr; |
277 |
– |
dnew->dtype = dinfo.dtype; |
386 |
|
break; |
387 |
+ |
case DTspec: |
388 |
+ |
if (!rmx_load_spec(dnew, fp)) |
389 |
+ |
goto loaderr; |
390 |
+ |
break; |
391 |
|
default: |
392 |
|
goto loaderr; |
393 |
|
} |
401 |
|
else |
402 |
|
funlockfile(fp); |
403 |
|
#endif |
404 |
+ |
/* undo exposure? */ |
405 |
+ |
if ((dnew->cexp[0] != 1.f) | |
406 |
+ |
(dnew->cexp[1] != 1.f) | (dnew->cexp[2] != 1.f)) { |
407 |
+ |
double cmlt[MAXCSAMP]; |
408 |
+ |
int i; |
409 |
+ |
cmlt[0] = 1./dnew->cexp[0]; |
410 |
+ |
cmlt[1] = 1./dnew->cexp[1]; |
411 |
+ |
cmlt[2] = 1./dnew->cexp[2]; |
412 |
+ |
if (dnew->ncomp > MAXCSAMP) |
413 |
+ |
goto loaderr; |
414 |
+ |
for (i = dnew->ncomp; i-- > 3; ) |
415 |
+ |
cmlt[i] = cmlt[1]; |
416 |
+ |
rmx_scale(dnew, cmlt); |
417 |
+ |
setcolor(dnew->cexp, 1.f, 1.f, 1.f); |
418 |
+ |
} |
419 |
|
return(dnew); |
420 |
|
loaderr: /* should report error? */ |
421 |
|
if (inspec[0] == '!') |
429 |
|
static int |
430 |
|
rmx_write_ascii(const RMATRIX *rm, FILE *fp) |
431 |
|
{ |
432 |
+ |
const char *fmt = (rm->dtype == DTfloat) ? " %.7e" : |
433 |
+ |
(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) | |
434 |
+ |
(rm->dtype == DTspec) ? " %.3e" : " %.15e" ; |
435 |
|
int i, j, k; |
436 |
|
|
437 |
|
for (i = 0; i < rm->nrows; i++) { |
438 |
|
for (j = 0; j < rm->ncols; j++) { |
439 |
+ |
const double *dp = rmx_lval(rm,i,j); |
440 |
|
for (k = 0; k < rm->ncomp; k++) |
441 |
< |
fprintf(fp, " %.15e", rmx_lval(rm,i,j,k)); |
441 |
> |
fprintf(fp, fmt, dp[k]); |
442 |
|
fputc('\t', fp); |
443 |
|
} |
444 |
|
fputc('\n', fp); |
458 |
|
} |
459 |
|
for (i = 0; i < rm->nrows; i++) |
460 |
|
for (j = 0; j < rm->ncols; j++) { |
461 |
+ |
const double *dp = rmx_lval(rm,i,j); |
462 |
|
for (k = rm->ncomp; k--; ) |
463 |
< |
val[k] = (float)rmx_lval(rm,i,j,k); |
464 |
< |
if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
463 |
> |
val[k] = (float)dp[k]; |
464 |
> |
if (putbinary(val, sizeof(float), rm->ncomp, fp) != rm->ncomp) |
465 |
|
return(0); |
466 |
|
} |
467 |
|
return(1); |
470 |
|
static int |
471 |
|
rmx_write_double(const RMATRIX *rm, FILE *fp) |
472 |
|
{ |
473 |
< |
int i, j, k; |
342 |
< |
double val[100]; |
473 |
> |
int i; |
474 |
|
|
344 |
– |
if (rm->ncomp > 100) { |
345 |
– |
fputs("Unsupported # components in rmx_write_double()\n", stderr); |
346 |
– |
exit(1); |
347 |
– |
} |
475 |
|
for (i = 0; i < rm->nrows; i++) |
476 |
< |
for (j = 0; j < rm->ncols; j++) { |
477 |
< |
for (k = rm->ncomp; k--; ) |
351 |
< |
val[k] = rmx_lval(rm,i,j,k); |
352 |
< |
if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
476 |
> |
if (putbinary(rmx_lval(rm,i,0), sizeof(double)*rm->ncomp, |
477 |
> |
rm->ncols, fp) != rm->ncols) |
478 |
|
return(0); |
354 |
– |
} |
479 |
|
return(1); |
480 |
|
} |
481 |
|
|
482 |
|
static int |
483 |
|
rmx_write_rgbe(const RMATRIX *rm, FILE *fp) |
484 |
|
{ |
485 |
< |
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
485 |
> |
COLR *scan = (COLR *)malloc(sizeof(COLR)*rm->ncols); |
486 |
|
int i, j; |
487 |
|
|
488 |
< |
if (scan == NULL) |
488 |
> |
if (!scan) |
489 |
|
return(0); |
490 |
|
for (i = 0; i < rm->nrows; i++) { |
491 |
< |
for (j = rm->ncols; j--; ) |
492 |
< |
setcolor(scan[j], rmx_lval(rm,i,j,0), |
493 |
< |
rmx_lval(rm,i,j,1), |
494 |
< |
rmx_lval(rm,i,j,2) ); |
495 |
< |
if (fwritescan(scan, rm->ncols, fp) < 0) { |
491 |
> |
for (j = rm->ncols; j--; ) { |
492 |
> |
const double *dp = rmx_lval(rm,i,j); |
493 |
> |
if (rm->ncomp == 1) |
494 |
> |
setcolr(scan[j], dp[0], dp[0], dp[0]); |
495 |
> |
else |
496 |
> |
setcolr(scan[j], dp[0], dp[1], dp[2]); |
497 |
> |
} |
498 |
> |
if (fwritecolrs(scan, rm->ncols, fp) < 0) { |
499 |
|
free(scan); |
500 |
|
return(0); |
501 |
|
} |
504 |
|
return(1); |
505 |
|
} |
506 |
|
|
507 |
+ |
static int |
508 |
+ |
rmx_write_spec(const RMATRIX *rm, FILE *fp) |
509 |
+ |
{ |
510 |
+ |
int prevNCSAMP = NCSAMP; |
511 |
+ |
uby8 *scan = (uby8 *)malloc((rm->ncomp+1)*rm->ncols); |
512 |
+ |
int ok = 1; |
513 |
+ |
SCOLOR scol; |
514 |
+ |
int i, j, k; |
515 |
+ |
|
516 |
+ |
if (!scan) |
517 |
+ |
return(0); |
518 |
+ |
NCSAMP = rm->ncomp; /* XXX: kosher? */ |
519 |
+ |
for (i = 0; i < rm->nrows; i++) { |
520 |
+ |
for (j = rm->ncols; j--; ) { |
521 |
+ |
const double *dp = rmx_lval(rm,i,j); |
522 |
+ |
for (k = NCSAMP; k--; ) |
523 |
+ |
scol[k] = dp[k]; |
524 |
+ |
scolor2scolr(scan+j*(NCSAMP+1), scol, NCSAMP); |
525 |
+ |
} |
526 |
+ |
if (fwritescolrs(scan, rm->ncols, fp) < 0) { |
527 |
+ |
ok = 0; |
528 |
+ |
break; |
529 |
+ |
} |
530 |
+ |
} |
531 |
+ |
free(scan); |
532 |
+ |
NCSAMP = prevNCSAMP; |
533 |
+ |
return(ok); |
534 |
+ |
} |
535 |
+ |
|
536 |
+ |
/* Check if CIE XYZ primaries were specified */ |
537 |
+ |
static int |
538 |
+ |
findCIEprims(const char *info) |
539 |
+ |
{ |
540 |
+ |
RGBPRIMS prims; |
541 |
+ |
|
542 |
+ |
if (!info) |
543 |
+ |
return(0); |
544 |
+ |
info = strstr(info, PRIMARYSTR); |
545 |
+ |
if (!info || !primsval(prims, info)) |
546 |
+ |
return(0); |
547 |
+ |
|
548 |
+ |
return((prims[RED][CIEX] > .99) & (prims[RED][CIEY] < .01) && |
549 |
+ |
(prims[GRN][CIEX] < .01) & (prims[GRN][CIEY] > .99) && |
550 |
+ |
(prims[BLU][CIEX] < .01) & (prims[BLU][CIEY] < .01)); |
551 |
+ |
} |
552 |
+ |
|
553 |
|
/* Write matrix to file type indicated by dtype */ |
554 |
|
int |
555 |
|
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
556 |
|
{ |
384 |
– |
RMATRIX *mydm = NULL; |
557 |
|
int ok = 1; |
558 |
|
|
559 |
< |
if ((rm == NULL) | (fp == NULL)) |
559 |
> |
if (!rm | !fp || !rm->mtx) |
560 |
|
return(0); |
561 |
|
#ifdef getc_unlocked |
562 |
|
flockfile(fp); |
566 |
|
fputs(rm->info, fp); |
567 |
|
if (dtype == DTfromHeader) |
568 |
|
dtype = rm->dtype; |
569 |
< |
else if ((dtype == DTrgbe) & (rm->dtype == DTxyze)) |
569 |
> |
else if (dtype == DTrgbe && (rm->dtype == DTxyze || |
570 |
> |
findCIEprims(rm->info))) |
571 |
|
dtype = DTxyze; |
572 |
|
else if ((dtype == DTxyze) & (rm->dtype == DTrgbe)) |
573 |
|
dtype = DTrgbe; |
574 |
+ |
/* write exposure? */ |
575 |
+ |
if (rm->ncomp == 3 && (rm->cexp[RED] != rm->cexp[GRN]) | |
576 |
+ |
(rm->cexp[GRN] != rm->cexp[BLU])) |
577 |
+ |
fputcolcor(rm->cexp, fp); |
578 |
+ |
else if (rm->cexp[GRN] != 1.f) |
579 |
+ |
fputexpos(rm->cexp[GRN], fp); |
580 |
|
if ((dtype != DTrgbe) & (dtype != DTxyze)) { |
581 |
< |
fprintf(fp, "NROWS=%d\n", rm->nrows); |
582 |
< |
fprintf(fp, "NCOLS=%d\n", rm->ncols); |
583 |
< |
fprintf(fp, "NCOMP=%d\n", rm->ncomp); |
584 |
< |
} else if (rm->ncomp != 3) { /* wrong # components? */ |
585 |
< |
double cmtx[3]; |
586 |
< |
if (rm->ncomp != 1) /* only convert grayscale */ |
587 |
< |
return(0); |
588 |
< |
cmtx[0] = cmtx[1] = cmtx[2] = 1; |
589 |
< |
mydm = rmx_transform(rm, 3, cmtx); |
590 |
< |
if (mydm == NULL) |
591 |
< |
return(0); |
592 |
< |
rm = mydm; |
593 |
< |
} |
594 |
< |
fputformat((char *)cm_fmt_id[dtype], fp); |
581 |
> |
if (dtype == DTspec) { |
582 |
> |
if (rm->ncomp < 3) |
583 |
> |
return(0); /* bad # components */ |
584 |
> |
fputwlsplit(rm->wlpart, fp); |
585 |
> |
} else { |
586 |
> |
fprintf(fp, "NROWS=%d\n", rm->nrows); |
587 |
> |
fprintf(fp, "NCOLS=%d\n", rm->ncols); |
588 |
> |
} |
589 |
> |
fputncomp(rm->ncomp, fp); |
590 |
> |
} else if ((rm->ncomp != 3) & (rm->ncomp != 1)) |
591 |
> |
return(0); /* wrong # components */ |
592 |
> |
if ((dtype == DTfloat) | (dtype == DTdouble)) |
593 |
> |
fputendian(fp); /* important to record */ |
594 |
> |
fputformat(cm_fmt_id[dtype], fp); |
595 |
|
fputc('\n', fp); |
596 |
|
switch (dtype) { /* write data */ |
597 |
|
case DTascii: |
608 |
|
fprtresolu(rm->ncols, rm->nrows, fp); |
609 |
|
ok = rmx_write_rgbe(rm, fp); |
610 |
|
break; |
611 |
+ |
case DTspec: |
612 |
+ |
fprtresolu(rm->ncols, rm->nrows, fp); |
613 |
+ |
ok = rmx_write_spec(rm, fp); |
614 |
+ |
break; |
615 |
|
default: |
616 |
|
return(0); |
617 |
|
} |
619 |
|
#ifdef getc_unlocked |
620 |
|
funlockfile(fp); |
621 |
|
#endif |
439 |
– |
rmx_free(mydm); |
622 |
|
return(ok); |
623 |
|
} |
624 |
|
|
629 |
|
RMATRIX *rid = rmx_alloc(dim, dim, n); |
630 |
|
int i, k; |
631 |
|
|
632 |
< |
if (rid == NULL) |
632 |
> |
if (!rid) |
633 |
|
return(NULL); |
634 |
< |
memset(rid->mtx, 0, sizeof(rid->mtx[0])*n*dim*dim); |
635 |
< |
for (i = dim; i--; ) |
634 |
> |
memset(rid->mtx, 0, array_size(rid)); |
635 |
> |
for (i = dim; i--; ) { |
636 |
> |
double *dp = rmx_lval(rid,i,i); |
637 |
|
for (k = n; k--; ) |
638 |
< |
rmx_lval(rid,i,i,k) = 1; |
638 |
> |
dp[k] = 1.; |
639 |
> |
} |
640 |
|
return(rid); |
641 |
|
} |
642 |
|
|
646 |
|
{ |
647 |
|
RMATRIX *dnew; |
648 |
|
|
649 |
< |
if (rm == NULL) |
649 |
> |
if (!rm) |
650 |
|
return(NULL); |
651 |
|
dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp); |
652 |
< |
if (dnew == NULL) |
652 |
> |
if (!dnew) |
653 |
|
return(NULL); |
654 |
|
rmx_addinfo(dnew, rm->info); |
655 |
|
dnew->dtype = rm->dtype; |
656 |
< |
memcpy(dnew->mtx, rm->mtx, |
657 |
< |
sizeof(rm->mtx[0])*rm->ncomp*rm->nrows*rm->ncols); |
656 |
> |
copycolor(dnew->cexp, rm->cexp); |
657 |
> |
memcpy(dnew->wlpart, rm->wlpart, sizeof(dnew->wlpart)); |
658 |
> |
memcpy(dnew->mtx, rm->mtx, array_size(dnew)); |
659 |
|
return(dnew); |
660 |
|
} |
661 |
|
|
664 |
|
rmx_transpose(const RMATRIX *rm) |
665 |
|
{ |
666 |
|
RMATRIX *dnew; |
667 |
< |
int i, j, k; |
667 |
> |
int i, j; |
668 |
|
|
669 |
< |
if (rm == NULL) |
669 |
> |
if (!rm) |
670 |
|
return(0); |
671 |
+ |
if ((rm->nrows == 1) | (rm->ncols == 1)) { |
672 |
+ |
dnew = rmx_copy(rm); |
673 |
+ |
if (!dnew) |
674 |
+ |
return(NULL); |
675 |
+ |
dnew->nrows = rm->ncols; |
676 |
+ |
dnew->ncols = rm->nrows; |
677 |
+ |
return(dnew); |
678 |
+ |
} |
679 |
|
dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp); |
680 |
< |
if (dnew == NULL) |
680 |
> |
if (!dnew) |
681 |
|
return(NULL); |
682 |
|
if (rm->info) { |
683 |
|
rmx_addinfo(dnew, rm->info); |
684 |
|
rmx_addinfo(dnew, "Transposed rows and columns\n"); |
685 |
|
} |
686 |
|
dnew->dtype = rm->dtype; |
687 |
< |
for (i = dnew->nrows; i--; ) |
688 |
< |
for (j = dnew->ncols; j--; ) |
689 |
< |
for (k = dnew->ncomp; k--; ) |
690 |
< |
rmx_lval(dnew,i,j,k) = rmx_lval(rm,j,i,k); |
687 |
> |
copycolor(dnew->cexp, rm->cexp); |
688 |
> |
memcpy(dnew->wlpart, rm->wlpart, sizeof(dnew->wlpart)); |
689 |
> |
for (j = dnew->ncols; j--; ) |
690 |
> |
for (i = dnew->nrows; i--; ) |
691 |
> |
memcpy(rmx_lval(dnew,i,j), rmx_lval(rm,j,i), |
692 |
> |
sizeof(double)*dnew->ncomp); |
693 |
|
return(dnew); |
694 |
|
} |
695 |
|
|
700 |
|
RMATRIX *mres; |
701 |
|
int i, j, k, h; |
702 |
|
|
703 |
< |
if ((m1 == NULL) | (m2 == NULL) || |
509 |
< |
(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
703 |
> |
if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
704 |
|
return(NULL); |
705 |
|
mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp); |
706 |
< |
if (mres == NULL) |
706 |
> |
if (!mres) |
707 |
|
return(NULL); |
708 |
|
i = rmx_newtype(m1->dtype, m2->dtype); |
709 |
|
if (i) |
713 |
|
for (i = mres->nrows; i--; ) |
714 |
|
for (j = mres->ncols; j--; ) |
715 |
|
for (k = mres->ncomp; k--; ) { |
716 |
< |
long double d = 0; |
716 |
> |
double d = 0; |
717 |
|
for (h = m1->ncols; h--; ) |
718 |
< |
d += rmx_lval(m1,i,h,k) * rmx_lval(m2,h,j,k); |
719 |
< |
rmx_lval(mres,i,j,k) = (double)d; |
718 |
> |
d += rmx_lval(m1,i,h)[k] * rmx_lval(m2,h,j)[k]; |
719 |
> |
rmx_lval(mres,i,j)[k] = d; |
720 |
|
} |
721 |
|
return(mres); |
722 |
|
} |
723 |
|
|
724 |
+ |
/* Element-wise multiplication (or division) of m2 into m1 */ |
725 |
+ |
int |
726 |
+ |
rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide) |
727 |
+ |
{ |
728 |
+ |
int zeroDivides = 0; |
729 |
+ |
int i, j, k; |
730 |
+ |
|
731 |
+ |
if (!m1 | !m2 || (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
732 |
+ |
return(0); |
733 |
+ |
if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp)) |
734 |
+ |
return(0); |
735 |
+ |
i = rmx_newtype(m1->dtype, m2->dtype); |
736 |
+ |
if (i) |
737 |
+ |
m1->dtype = i; |
738 |
+ |
else |
739 |
+ |
rmx_addinfo(m1, rmx_mismatch_warn); |
740 |
+ |
for (i = m1->nrows; i--; ) |
741 |
+ |
for (j = m1->ncols; j--; ) |
742 |
+ |
if (divide) { |
743 |
+ |
double d; |
744 |
+ |
if (m2->ncomp == 1) { |
745 |
+ |
d = rmx_lval(m2,i,j)[0]; |
746 |
+ |
if (d == 0) { |
747 |
+ |
++zeroDivides; |
748 |
+ |
for (k = m1->ncomp; k--; ) |
749 |
+ |
rmx_lval(m1,i,j)[k] = 0; |
750 |
+ |
} else { |
751 |
+ |
d = 1./d; |
752 |
+ |
for (k = m1->ncomp; k--; ) |
753 |
+ |
rmx_lval(m1,i,j)[k] *= d; |
754 |
+ |
} |
755 |
+ |
} else |
756 |
+ |
for (k = m1->ncomp; k--; ) { |
757 |
+ |
d = rmx_lval(m2,i,j)[k]; |
758 |
+ |
if (d == 0) { |
759 |
+ |
++zeroDivides; |
760 |
+ |
rmx_lval(m1,i,j)[k] = 0; |
761 |
+ |
} else |
762 |
+ |
rmx_lval(m1,i,j)[k] /= d; |
763 |
+ |
} |
764 |
+ |
} else { |
765 |
+ |
if (m2->ncomp == 1) { |
766 |
+ |
const double d = rmx_lval(m2,i,j)[0]; |
767 |
+ |
for (k = m1->ncomp; k--; ) |
768 |
+ |
rmx_lval(m1,i,j)[k] *= d; |
769 |
+ |
} else |
770 |
+ |
for (k = m1->ncomp; k--; ) |
771 |
+ |
rmx_lval(m1,i,j)[k] *= rmx_lval(m2,i,j)[k]; |
772 |
+ |
} |
773 |
+ |
if (zeroDivides) { |
774 |
+ |
rmx_addinfo(m1, "WARNING: zero divide(s) corrupted results\n"); |
775 |
+ |
errno = ERANGE; |
776 |
+ |
} |
777 |
+ |
return(1); |
778 |
+ |
} |
779 |
+ |
|
780 |
|
/* Sum second matrix into first, applying scale factor beforehand */ |
781 |
|
int |
782 |
|
rmx_sum(RMATRIX *msum, const RMATRIX *madd, const double sf[]) |
784 |
|
double *mysf = NULL; |
785 |
|
int i, j, k; |
786 |
|
|
787 |
< |
if ((msum == NULL) | (madd == NULL) || |
787 |
> |
if (!msum | !madd || |
788 |
|
(msum->nrows != madd->nrows) | |
789 |
|
(msum->ncols != madd->ncols) | |
790 |
|
(msum->ncomp != madd->ncomp)) |
791 |
|
return(0); |
792 |
< |
if (sf == NULL) { |
792 |
> |
if (!sf) { |
793 |
|
mysf = (double *)malloc(sizeof(double)*msum->ncomp); |
794 |
< |
if (mysf == NULL) |
794 |
> |
if (!mysf) |
795 |
|
return(0); |
796 |
|
for (k = msum->ncomp; k--; ) |
797 |
|
mysf[k] = 1; |
803 |
|
else |
804 |
|
rmx_addinfo(msum, rmx_mismatch_warn); |
805 |
|
for (i = msum->nrows; i--; ) |
806 |
< |
for (j = msum->ncols; j--; ) |
806 |
> |
for (j = msum->ncols; j--; ) { |
807 |
> |
const double *da = rmx_lval(madd,i,j); |
808 |
> |
double *ds = rmx_lval(msum,i,j); |
809 |
|
for (k = msum->ncomp; k--; ) |
810 |
< |
rmx_lval(msum,i,j,k) += sf[k] * rmx_lval(madd,i,j,k); |
811 |
< |
|
812 |
< |
free(mysf); |
810 |
> |
ds[k] += sf[k] * da[k]; |
811 |
> |
} |
812 |
> |
if (mysf) |
813 |
> |
free(mysf); |
814 |
|
return(1); |
815 |
|
} |
816 |
|
|
820 |
|
{ |
821 |
|
int i, j, k; |
822 |
|
|
823 |
< |
if ((rm == NULL) | (sf == NULL)) |
823 |
> |
if (!rm | !sf) |
824 |
|
return(0); |
825 |
|
for (i = rm->nrows; i--; ) |
826 |
< |
for (j = rm->ncols; j--; ) |
826 |
> |
for (j = rm->ncols; j--; ) { |
827 |
> |
double *dp = rmx_lval(rm,i,j); |
828 |
|
for (k = rm->ncomp; k--; ) |
829 |
< |
rmx_lval(rm,i,j,k) *= sf[k]; |
830 |
< |
|
829 |
> |
dp[k] *= sf[k]; |
830 |
> |
} |
831 |
> |
if (rm->info) |
832 |
> |
rmx_addinfo(rm, "Applied scalar\n"); |
833 |
> |
/* XXX: should record as exposure for COLR and SCOLR types? */ |
834 |
|
return(1); |
835 |
|
} |
836 |
|
|
841 |
|
int i, j, ks, kd; |
842 |
|
RMATRIX *dnew; |
843 |
|
|
844 |
< |
if ((msrc == NULL) | (n <= 0) | (cmat == NULL)) |
844 |
> |
if (!msrc | (n <= 0) | !cmat) |
845 |
|
return(NULL); |
846 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
847 |
< |
if (dnew == NULL) |
847 |
> |
if (!dnew) |
848 |
|
return(NULL); |
849 |
+ |
if (msrc->info) { |
850 |
+ |
char buf[128]; |
851 |
+ |
sprintf(buf, "Applied %dx%d component transform\n", |
852 |
+ |
dnew->ncomp, msrc->ncomp); |
853 |
+ |
rmx_addinfo(dnew, msrc->info); |
854 |
+ |
rmx_addinfo(dnew, buf); |
855 |
+ |
} |
856 |
|
dnew->dtype = msrc->dtype; |
857 |
|
for (i = dnew->nrows; i--; ) |
858 |
< |
for (j = dnew->ncols; j--; ) |
858 |
> |
for (j = dnew->ncols; j--; ) { |
859 |
> |
const double *ds = rmx_lval(msrc,i,j); |
860 |
|
for (kd = dnew->ncomp; kd--; ) { |
861 |
|
double d = 0; |
862 |
|
for (ks = msrc->ncomp; ks--; ) |
863 |
< |
d += cmat[kd*msrc->ncomp + ks] * rmx_lval(msrc,i,j,ks); |
864 |
< |
rmx_lval(dnew,i,j,kd) = d; |
863 |
> |
d += cmat[kd*msrc->ncomp + ks] * ds[ks]; |
864 |
> |
rmx_lval(dnew,i,j)[kd] = d; |
865 |
|
} |
866 |
+ |
} |
867 |
|
return(dnew); |
868 |
|
} |
869 |
|
|
874 |
|
int i, j; |
875 |
|
RMATRIX *dnew; |
876 |
|
|
877 |
< |
if (cm == NULL) |
877 |
> |
if (!cm) |
878 |
|
return(NULL); |
879 |
|
dnew = rmx_alloc(cm->nrows, cm->ncols, 3); |
880 |
< |
if (dnew == NULL) |
880 |
> |
if (!dnew) |
881 |
|
return(NULL); |
882 |
|
dnew->dtype = DTfloat; |
883 |
|
for (i = dnew->nrows; i--; ) |
884 |
|
for (j = dnew->ncols; j--; ) { |
885 |
|
const COLORV *cv = cm_lval(cm,i,j); |
886 |
< |
rmx_lval(dnew,i,j,0) = cv[0]; |
887 |
< |
rmx_lval(dnew,i,j,1) = cv[1]; |
888 |
< |
rmx_lval(dnew,i,j,2) = cv[2]; |
886 |
> |
double *dp = rmx_lval(dnew,i,j); |
887 |
> |
dp[0] = cv[0]; |
888 |
> |
dp[1] = cv[1]; |
889 |
> |
dp[2] = cv[2]; |
890 |
|
} |
891 |
|
return(dnew); |
892 |
|
} |
898 |
|
int i, j; |
899 |
|
CMATRIX *cnew; |
900 |
|
|
901 |
< |
if (rm == NULL || rm->ncomp != 3) |
901 |
> |
if (!rm || !rm->mtx | (rm->ncomp == 2)) |
902 |
|
return(NULL); |
903 |
|
cnew = cm_alloc(rm->nrows, rm->ncols); |
904 |
< |
if (cnew == NULL) |
904 |
> |
if (!cnew) |
905 |
|
return(NULL); |
906 |
|
for (i = cnew->nrows; i--; ) |
907 |
|
for (j = cnew->ncols; j--; ) { |
908 |
< |
COLORV *cv = cm_lval(cnew,i,j); |
909 |
< |
cv[0] = (COLORV)rmx_lval(rm,i,j,0); |
910 |
< |
cv[1] = (COLORV)rmx_lval(rm,i,j,1); |
911 |
< |
cv[2] = (COLORV)rmx_lval(rm,i,j,2); |
908 |
> |
const double *dp = rmx_lval(rm,i,j); |
909 |
> |
COLORV *cv = cm_lval(cnew,i,j); |
910 |
> |
switch (rm->ncomp) { |
911 |
> |
case 3: |
912 |
> |
setcolor(cv, dp[0], dp[1], dp[2]); |
913 |
> |
break; |
914 |
> |
case 1: |
915 |
> |
setcolor(cv, dp[0], dp[0], dp[0]); |
916 |
> |
break; |
917 |
> |
default: { |
918 |
> |
SCOLOR scol; |
919 |
> |
int k; |
920 |
> |
for (k = rm->ncomp; k--; ) |
921 |
> |
scol[k] = dp[k]; |
922 |
> |
scolor2color(cv, scol, rm->ncomp, rm->wlpart); |
923 |
> |
} break; |
924 |
> |
} |
925 |
|
} |
926 |
|
return(cnew); |
927 |
|
} |