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 |
|
#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) |
25 |
|
RMATRIX * |
26 |
|
rmx_new(int nr, int nc, int n) |
27 |
|
{ |
28 |
< |
RMATRIX *dnew = (RMATRIX *)calloc(1, sizeof(RMATRIX)); |
28 |
> |
RMATRIX *dnew; |
29 |
|
|
30 |
+ |
if (n <= 0) |
31 |
+ |
return(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 |
|
} |
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 |
|
} |
68 |
|
return(dnew); |
69 |
|
} |
70 |
|
|
71 |
< |
/* Free a RMATRIX array */ |
71 |
> |
/* Clear state by freeing info and matrix data */ |
72 |
|
void |
73 |
< |
rmx_free(RMATRIX *rm) |
73 |
> |
rmx_reset(RMATRIX *rm) |
74 |
|
{ |
75 |
|
if (!rm) return; |
76 |
< |
if (rm->info) |
76 |
> |
if (rm->info) { |
77 |
|
free(rm->info); |
78 |
+ |
rm->info = NULL; |
79 |
+ |
} |
80 |
+ |
if (rm->mtx) { |
81 |
|
#ifdef MAP_FILE |
82 |
< |
if (rm->mapped) |
83 |
< |
munmap(rm->mapped, mapped_size(rm)); |
84 |
< |
else |
82 |
> |
if (rm->mapped) { |
83 |
> |
munmap(rm->mapped, mapped_size(rm)); |
84 |
> |
rm->mapped = NULL; |
85 |
> |
} else |
86 |
|
#endif |
87 |
< |
free(rm->mtx); |
87 |
> |
free(rm->mtx); |
88 |
> |
rm->mtx = NULL; |
89 |
> |
} |
90 |
> |
} |
91 |
> |
|
92 |
> |
/* Free an RMATRIX struct and data */ |
93 |
> |
void |
94 |
> |
rmx_free(RMATRIX *rm) |
95 |
> |
{ |
96 |
> |
if (!rm) return; |
97 |
> |
rmx_reset(rm); |
98 |
|
free(rm); |
99 |
|
} |
100 |
|
|
102 |
|
int |
103 |
|
rmx_newtype(int dtyp1, int dtyp2) |
104 |
|
{ |
105 |
< |
if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) | |
106 |
< |
(dtyp2==DTxyze) | (dtyp2==DTrgbe) |
105 |
> |
if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) | (dtyp1==DTspec) | |
106 |
> |
(dtyp2==DTxyze) | (dtyp2==DTrgbe) | (dtyp2==DTspec) |
107 |
|
&& dtyp1 != dtyp2) |
108 |
|
return(0); |
109 |
|
if (dtyp1 < dtyp2) |
142 |
|
|
143 |
|
if (headidval(NULL, s)) |
144 |
|
return(0); |
145 |
< |
if (!strncmp(s, "NCOMP=", 6)) { |
146 |
< |
ip->ncomp = atoi(s+6); |
145 |
> |
if (isncomp(s)) { |
146 |
> |
ip->ncomp = ncompval(s); |
147 |
|
return(0); |
148 |
|
} |
149 |
|
if (!strncmp(s, "NROWS=", 6)) { |
169 |
|
multcolor(ip->cexp, ctmp); |
170 |
|
return(0); |
171 |
|
} |
172 |
+ |
if (iswlsplit(s)) { |
173 |
+ |
wlsplitval(ip->wlpart, s); |
174 |
+ |
return(0); |
175 |
+ |
} |
176 |
|
if (!formatval(fmt, s)) { |
177 |
|
rmx_addinfo(ip, s); |
178 |
|
return(0); |
186 |
|
} |
187 |
|
|
188 |
|
static int |
189 |
< |
rmx_load_ascii(RMATRIX *rm, FILE *fp) |
189 |
> |
rmx_load_ascii(double *drp, const RMATRIX *rm, FILE *fp) |
190 |
|
{ |
191 |
< |
int i, j, k; |
191 |
> |
int j, k; |
192 |
|
|
193 |
< |
if (!rmx_prepare(rm)) |
194 |
< |
return(0); |
195 |
< |
for (i = 0; i < rm->nrows; i++) |
196 |
< |
for (j = 0; j < rm->ncols; j++) { |
172 |
< |
double *dp = rmx_lval(rm,i,j); |
173 |
< |
for (k = 0; k < rm->ncomp; k++) |
174 |
< |
if (fscanf(fp, "%lf", &dp[k]) != 1) |
175 |
< |
return(0); |
176 |
< |
} |
193 |
> |
for (j = 0; j < rm->ncols; j++) |
194 |
> |
for (k = rm->ncomp; k-- > 0; ) |
195 |
> |
if (fscanf(fp, "%lf", drp++) != 1) |
196 |
> |
return(0); |
197 |
|
return(1); |
198 |
|
} |
199 |
|
|
200 |
|
static int |
201 |
< |
rmx_load_float(RMATRIX *rm, FILE *fp) |
201 |
> |
rmx_load_float(double *drp, const RMATRIX *rm, FILE *fp) |
202 |
|
{ |
203 |
< |
int i, j, k; |
203 |
> |
int j, k; |
204 |
|
float val[100]; |
205 |
|
|
206 |
|
if (rm->ncomp > 100) { |
207 |
|
fputs("Unsupported # components in rmx_load_float()\n", stderr); |
208 |
|
exit(1); |
209 |
|
} |
210 |
< |
if (!rmx_prepare(rm)) |
191 |
< |
return(0); |
192 |
< |
for (i = 0; i < rm->nrows; i++) |
193 |
< |
for (j = 0; j < rm->ncols; j++) { |
194 |
< |
double *dp = rmx_lval(rm,i,j); |
210 |
> |
for (j = 0; j < rm->ncols; j++) { |
211 |
|
if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp) |
212 |
< |
return(0); |
212 |
> |
return(0); |
213 |
|
if (rm->swapin) |
214 |
< |
swap32((char *)val, rm->ncomp); |
215 |
< |
for (k = rm->ncomp; k--; ) |
216 |
< |
dp[k] = val[k]; |
217 |
< |
} |
214 |
> |
swap32((char *)val, rm->ncomp); |
215 |
> |
for (k = 0; k < rm->ncomp; k++) |
216 |
> |
*drp++ = val[k]; |
217 |
> |
} |
218 |
|
return(1); |
219 |
|
} |
220 |
|
|
221 |
|
static int |
222 |
< |
rmx_load_double(RMATRIX *rm, FILE *fp) |
222 |
> |
rmx_load_double(double *drp, const RMATRIX *rm, FILE *fp) |
223 |
|
{ |
224 |
+ |
if (getbinary(drp, sizeof(*drp)*rm->ncomp, rm->ncols, fp) != rm->ncols) |
225 |
+ |
return(0); |
226 |
+ |
if (rm->swapin) |
227 |
+ |
swap64((char *)drp, rm->ncols*rm->ncomp); |
228 |
+ |
return(1); |
229 |
+ |
} |
230 |
+ |
|
231 |
+ |
static int |
232 |
+ |
rmx_load_rgbe(double *drp, const RMATRIX *rm, FILE *fp) |
233 |
+ |
{ |
234 |
+ |
COLR *scan; |
235 |
+ |
COLOR col; |
236 |
+ |
int j; |
237 |
+ |
|
238 |
+ |
if (rm->ncomp != 3) |
239 |
+ |
return(0); |
240 |
+ |
scan = (COLR *)tempbuffer(sizeof(COLR)*rm->ncols); |
241 |
+ |
if (!scan) |
242 |
+ |
return(0); |
243 |
+ |
if (freadcolrs(scan, rm->ncols, fp) < 0) |
244 |
+ |
return(0); |
245 |
+ |
for (j = 0; j < rm->ncols; j++) { |
246 |
+ |
colr_color(col, scan[j]); |
247 |
+ |
*drp++ = colval(col,RED); |
248 |
+ |
*drp++ = colval(col,GRN); |
249 |
+ |
*drp++ = colval(col,BLU); |
250 |
+ |
} |
251 |
+ |
return(1); |
252 |
+ |
} |
253 |
+ |
|
254 |
+ |
static int |
255 |
+ |
rmx_load_spec(double *drp, const RMATRIX *rm, FILE *fp) |
256 |
+ |
{ |
257 |
+ |
uby8 *scan; |
258 |
+ |
SCOLOR scol; |
259 |
+ |
int j, k; |
260 |
+ |
|
261 |
+ |
if ((rm->ncomp < 3) | (rm->ncomp > MAXCSAMP)) |
262 |
+ |
return(0); |
263 |
+ |
scan = (uby8 *)tempbuffer((rm->ncomp+1)*rm->ncols); |
264 |
+ |
if (!scan) |
265 |
+ |
return(0); |
266 |
+ |
if (freadscolrs(scan, rm->ncomp, rm->ncols, fp) < 0) |
267 |
+ |
return(0); |
268 |
+ |
for (j = 0; j < rm->ncols; j++) { |
269 |
+ |
scolr2scolor(scol, scan+j*(rm->ncomp+1), rm->ncomp); |
270 |
+ |
for (k = 0; k < rm->ncomp; k++) |
271 |
+ |
*drp++ = scol[k]; |
272 |
+ |
} |
273 |
+ |
return(1); |
274 |
+ |
} |
275 |
+ |
|
276 |
+ |
/* Read matrix header from input stream (cannot be XML) */ |
277 |
+ |
int |
278 |
+ |
rmx_load_header(RMATRIX *rm, FILE *fp) |
279 |
+ |
{ |
280 |
+ |
if (!rm | !fp) |
281 |
+ |
return(0); |
282 |
+ |
rmx_reset(rm); /* clear state */ |
283 |
+ |
if (rm->nrows | rm->ncols | !rm->dtype) { |
284 |
+ |
rm->nrows = rm->ncols = 0; |
285 |
+ |
rm->ncomp = 3; |
286 |
+ |
setcolor(rm->cexp, 1.f, 1.f, 1.f); |
287 |
+ |
memcpy(rm->wlpart, WLPART, sizeof(rm->wlpart)); |
288 |
+ |
rm->swapin = 0; |
289 |
+ |
} |
290 |
+ |
rm->dtype = DTascii; /* assumed w/o FORMAT */ |
291 |
+ |
if (getheader(fp, get_dminfo, rm) < 0) { |
292 |
+ |
fputs("Unrecognized matrix format\n", stderr); |
293 |
+ |
return(0); |
294 |
+ |
} |
295 |
+ |
if ((rm->dtype == DTrgbe) | (rm->dtype == DTxyze) && |
296 |
+ |
rm->ncomp != 3) |
297 |
+ |
return(0); |
298 |
+ |
if (rm->ncols <= 0 && /* resolution string? */ |
299 |
+ |
!fscnresolu(&rm->ncols, &rm->nrows, fp)) |
300 |
+ |
return(0); |
301 |
+ |
if (rm->dtype == DTascii) /* set file type (WINDOWS) */ |
302 |
+ |
SET_FILE_TEXT(fp); |
303 |
+ |
else |
304 |
+ |
SET_FILE_BINARY(fp); |
305 |
+ |
return(1); |
306 |
+ |
} |
307 |
+ |
|
308 |
+ |
/* Load next row as double (cannot be XML) */ |
309 |
+ |
int |
310 |
+ |
rmx_load_row(double *drp, const RMATRIX *rm, FILE *fp) |
311 |
+ |
{ |
312 |
+ |
switch (rm->dtype) { |
313 |
+ |
case DTascii: |
314 |
+ |
return(rmx_load_ascii(drp, rm, fp)); |
315 |
+ |
case DTfloat: |
316 |
+ |
return(rmx_load_float(drp, rm, fp)); |
317 |
+ |
case DTdouble: |
318 |
+ |
return(rmx_load_double(drp, rm, fp)); |
319 |
+ |
case DTrgbe: |
320 |
+ |
case DTxyze: |
321 |
+ |
return(rmx_load_rgbe(drp, rm, fp)); |
322 |
+ |
case DTspec: |
323 |
+ |
return(rmx_load_spec(drp, rm, fp)); |
324 |
+ |
default: |
325 |
+ |
fputs("Unsupported data type in rmx_load_row()\n", stderr); |
326 |
+ |
} |
327 |
+ |
return(0); |
328 |
+ |
} |
329 |
+ |
|
330 |
+ |
/* Allocate & load post-header data from stream given type set in rm->dtype */ |
331 |
+ |
int |
332 |
+ |
rmx_load_data(RMATRIX *rm, FILE *fp) |
333 |
+ |
{ |
334 |
|
int i; |
335 |
|
#ifdef MAP_FILE |
336 |
|
long pos; /* map memory for file > 1MB if possible */ |
337 |
< |
if (!rm->swapin && array_size(rm) >= 1L<<20 && |
337 |
> |
if ((rm->dtype == DTdouble) & !rm->swapin && array_size(rm) >= 1L<<20 && |
338 |
|
(pos = ftell(fp)) >= 0 && !(pos % sizeof(double))) { |
339 |
|
rm->mapped = mmap(NULL, array_size(rm)+pos, PROT_READ|PROT_WRITE, |
340 |
|
MAP_PRIVATE, fileno(fp), 0); |
345 |
|
rm->mapped = NULL; |
346 |
|
} |
347 |
|
#endif |
348 |
< |
if (!rmx_prepare(rm)) |
348 |
> |
if (!rmx_prepare(rm)) { /* need in-core matrix array */ |
349 |
> |
fprintf(stderr, "Cannot allocate %g MByte matrix array\n", |
350 |
> |
(1./(1L<<20))*(double)array_size(rm)); |
351 |
|
return(0); |
224 |
– |
for (i = 0; i < rm->nrows; i++) { |
225 |
– |
if (getbinary(rmx_lval(rm,i,0), sizeof(double)*rm->ncomp, |
226 |
– |
rm->ncols, fp) != rm->ncols) |
227 |
– |
return(0); |
228 |
– |
if (rm->swapin) |
229 |
– |
swap64((char *)rmx_lval(rm,i,0), rm->ncols*rm->ncomp); |
352 |
|
} |
353 |
+ |
for (i = 0; i < rm->nrows; i++) |
354 |
+ |
if (!rmx_load_row(rmx_lval(rm,i,0), rm, fp)) |
355 |
+ |
return(0); |
356 |
|
return(1); |
357 |
|
} |
358 |
|
|
234 |
– |
static int |
235 |
– |
rmx_load_rgbe(RMATRIX *rm, FILE *fp) |
236 |
– |
{ |
237 |
– |
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
238 |
– |
int i, j; |
239 |
– |
|
240 |
– |
if (!scan) |
241 |
– |
return(0); |
242 |
– |
if (!rmx_prepare(rm)) |
243 |
– |
return(0); |
244 |
– |
for (i = 0; i < rm->nrows; i++) { |
245 |
– |
double *dp = rmx_lval(rm,i,0); |
246 |
– |
if (freadscan(scan, rm->ncols, fp) < 0) { |
247 |
– |
free(scan); |
248 |
– |
return(0); |
249 |
– |
} |
250 |
– |
for (j = 0; j < rm->ncols; j++, dp += 3) { |
251 |
– |
dp[0] = colval(scan[j],RED); |
252 |
– |
dp[1] = colval(scan[j],GRN); |
253 |
– |
dp[2] = colval(scan[j],BLU); |
254 |
– |
} |
255 |
– |
} |
256 |
– |
free(scan); |
257 |
– |
return(1); |
258 |
– |
} |
259 |
– |
|
359 |
|
/* Load matrix from supported file type */ |
360 |
|
RMATRIX * |
361 |
|
rmx_load(const char *inspec, RMPref rmp) |
362 |
|
{ |
363 |
|
FILE *fp; |
364 |
|
RMATRIX *dnew; |
365 |
+ |
int ok; |
366 |
|
|
367 |
|
if (!inspec) |
368 |
|
inspec = stdin_name; |
369 |
|
else if (!*inspec) |
370 |
|
return(NULL); |
371 |
< |
if (inspec == stdin_name) { /* reading from stdin? */ |
371 |
> |
if (inspec == stdin_name) /* reading from stdin? */ |
372 |
|
fp = stdin; |
373 |
< |
} else if (inspec[0] == '!') { |
374 |
< |
if (!(fp = popen(inspec+1, "r"))) |
375 |
< |
return(NULL); |
276 |
< |
} else { |
373 |
> |
else if (inspec[0] == '!') |
374 |
> |
fp = popen(inspec+1, "r"); |
375 |
> |
else if (rmp != RMPnone) { |
376 |
|
const char *sp = inspec; /* check suffix */ |
377 |
|
while (*sp) |
378 |
|
++sp; |
386 |
|
dnew = rmx_from_cmatrix(cm); |
387 |
|
cm_free(cm); |
388 |
|
dnew->dtype = DTascii; |
389 |
< |
return(dnew); |
390 |
< |
} |
391 |
< |
/* else open it ourselves */ |
293 |
< |
if (!(fp = fopen(inspec, "r"))) |
294 |
< |
return(NULL); |
389 |
> |
return(dnew); /* return here */ |
390 |
> |
} /* else open it ourselves */ |
391 |
> |
fp = fopen(inspec, "r"); |
392 |
|
} |
393 |
< |
SET_FILE_BINARY(fp); |
393 |
> |
if (!fp) |
394 |
> |
return(NULL); |
395 |
|
#ifdef getc_unlocked |
396 |
|
flockfile(fp); |
397 |
|
#endif |
398 |
< |
if (!(dnew = rmx_new(0,0,3))) { |
399 |
< |
fclose(fp); |
398 |
> |
SET_FILE_BINARY(fp); /* load header info */ |
399 |
> |
if (!rmx_load_header(dnew = rmx_new(0,0,3), fp)) { |
400 |
> |
fprintf(stderr, "Bad header in: %s\n", inspec); |
401 |
> |
if (inspec[0] == '!') pclose(fp); |
402 |
> |
else fclose(fp); |
403 |
> |
rmx_free(dnew); |
404 |
|
return(NULL); |
405 |
|
} |
406 |
< |
dnew->dtype = DTascii; /* assumed w/o FORMAT */ |
407 |
< |
if (getheader(fp, get_dminfo, dnew) < 0) { |
408 |
< |
fclose(fp); |
307 |
< |
return(NULL); |
308 |
< |
} |
309 |
< |
if ((dnew->nrows <= 0) | (dnew->ncols <= 0)) { |
310 |
< |
if (!fscnresolu(&dnew->ncols, &dnew->nrows, fp)) { |
311 |
< |
fclose(fp); |
312 |
< |
return(NULL); |
313 |
< |
} |
314 |
< |
if ((dnew->dtype == DTrgbe) | (dnew->dtype == DTxyze) && |
315 |
< |
dnew->ncomp != 3) { |
316 |
< |
fclose(fp); |
317 |
< |
return(NULL); |
318 |
< |
} |
319 |
< |
} |
320 |
< |
switch (dnew->dtype) { |
321 |
< |
case DTascii: |
322 |
< |
SET_FILE_TEXT(fp); |
323 |
< |
if (!rmx_load_ascii(dnew, fp)) |
324 |
< |
goto loaderr; |
325 |
< |
dnew->dtype = DTascii; /* should leave double? */ |
326 |
< |
break; |
327 |
< |
case DTfloat: |
328 |
< |
if (!rmx_load_float(dnew, fp)) |
329 |
< |
goto loaderr; |
330 |
< |
dnew->dtype = DTfloat; |
331 |
< |
break; |
332 |
< |
case DTdouble: |
333 |
< |
if (!rmx_load_double(dnew, fp)) |
334 |
< |
goto loaderr; |
335 |
< |
dnew->dtype = DTdouble; |
336 |
< |
break; |
337 |
< |
case DTrgbe: |
338 |
< |
case DTxyze: |
339 |
< |
if (!rmx_load_rgbe(dnew, fp)) |
340 |
< |
goto loaderr; |
341 |
< |
break; |
342 |
< |
default: |
343 |
< |
goto loaderr; |
344 |
< |
} |
345 |
< |
if (fp != stdin) { |
406 |
> |
ok = rmx_load_data(dnew, fp); /* allocate & load data */ |
407 |
> |
|
408 |
> |
if (fp != stdin) { /* close input stream */ |
409 |
|
if (inspec[0] == '!') |
410 |
|
pclose(fp); |
411 |
|
else |
415 |
|
else |
416 |
|
funlockfile(fp); |
417 |
|
#endif |
418 |
+ |
if (!ok) { /* load failure? */ |
419 |
+ |
fprintf(stderr, "Error loading data from: %s\n", inspec); |
420 |
+ |
rmx_free(dnew); |
421 |
+ |
return(NULL); |
422 |
+ |
} |
423 |
|
/* undo exposure? */ |
424 |
< |
if (dnew->ncomp == 3 && (dnew->cexp[0] != 1.f) | |
424 |
> |
if ((dnew->cexp[0] != 1.f) | |
425 |
|
(dnew->cexp[1] != 1.f) | (dnew->cexp[2] != 1.f)) { |
426 |
< |
double cmlt[3]; |
426 |
> |
double cmlt[MAXCSAMP]; |
427 |
> |
int i; |
428 |
|
cmlt[0] = 1./dnew->cexp[0]; |
429 |
|
cmlt[1] = 1./dnew->cexp[1]; |
430 |
|
cmlt[2] = 1./dnew->cexp[2]; |
431 |
+ |
if (dnew->ncomp > MAXCSAMP) { |
432 |
+ |
fprintf(stderr, "Excess spectral components in: %s\n", |
433 |
+ |
inspec); |
434 |
+ |
rmx_free(dnew); |
435 |
+ |
return(NULL); |
436 |
+ |
} |
437 |
+ |
for (i = dnew->ncomp; i-- > 3; ) |
438 |
+ |
cmlt[i] = cmlt[1]; |
439 |
|
rmx_scale(dnew, cmlt); |
440 |
|
setcolor(dnew->cexp, 1.f, 1.f, 1.f); |
441 |
|
} |
442 |
|
return(dnew); |
366 |
– |
loaderr: /* should report error? */ |
367 |
– |
if (inspec[0] == '!') |
368 |
– |
pclose(fp); |
369 |
– |
else |
370 |
– |
fclose(fp); |
371 |
– |
rmx_free(dnew); |
372 |
– |
return(NULL); |
443 |
|
} |
444 |
|
|
445 |
|
static int |
446 |
< |
rmx_write_ascii(const RMATRIX *rm, FILE *fp) |
446 |
> |
rmx_write_ascii(const double *dp, int nc, int len, FILE *fp) |
447 |
|
{ |
448 |
< |
const char *fmt = (rm->dtype == DTfloat) ? " %.7e" : |
449 |
< |
(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) ? " %.3e" : |
450 |
< |
" %.15e" ; |
451 |
< |
int i, j, k; |
382 |
< |
|
383 |
< |
for (i = 0; i < rm->nrows; i++) { |
384 |
< |
for (j = 0; j < rm->ncols; j++) { |
385 |
< |
const double *dp = rmx_lval(rm,i,j); |
386 |
< |
for (k = 0; k < rm->ncomp; k++) |
387 |
< |
fprintf(fp, fmt, dp[k]); |
448 |
> |
while (len-- > 0) { |
449 |
> |
int k = nc; |
450 |
> |
while (nc-- > 0) |
451 |
> |
fprintf(fp, " %.7e", *dp++); |
452 |
|
fputc('\t', fp); |
389 |
– |
} |
390 |
– |
fputc('\n', fp); |
453 |
|
} |
454 |
< |
return(1); |
454 |
> |
return(fputc('\n', fp) != EOF); |
455 |
|
} |
456 |
|
|
457 |
|
static int |
458 |
< |
rmx_write_float(const RMATRIX *rm, FILE *fp) |
458 |
> |
rmx_write_float(const double *dp, int len, FILE *fp) |
459 |
|
{ |
460 |
< |
int i, j, k; |
399 |
< |
float val[100]; |
460 |
> |
float val; |
461 |
|
|
462 |
< |
if (rm->ncomp > 100) { |
463 |
< |
fputs("Unsupported # components in rmx_write_float()\n", stderr); |
464 |
< |
exit(1); |
404 |
< |
} |
405 |
< |
for (i = 0; i < rm->nrows; i++) |
406 |
< |
for (j = 0; j < rm->ncols; j++) { |
407 |
< |
const double *dp = rmx_lval(rm,i,j); |
408 |
< |
for (k = rm->ncomp; k--; ) |
409 |
< |
val[k] = (float)dp[k]; |
410 |
< |
if (putbinary(val, sizeof(float), rm->ncomp, fp) != rm->ncomp) |
462 |
> |
while (len--) { |
463 |
> |
val = *dp++; |
464 |
> |
if (putbinary(&val, sizeof(float), 1, fp) != 1) |
465 |
|
return(0); |
466 |
< |
} |
466 |
> |
} |
467 |
|
return(1); |
468 |
|
} |
469 |
|
|
470 |
|
static int |
471 |
< |
rmx_write_double(const RMATRIX *rm, FILE *fp) |
471 |
> |
rmx_write_rgbe(const double *dp, int nc, int len, FILE *fp) |
472 |
|
{ |
473 |
< |
int i; |
473 |
> |
COLR *scan; |
474 |
> |
int j; |
475 |
|
|
476 |
< |
for (i = 0; i < rm->nrows; i++) |
477 |
< |
if (putbinary(rmx_lval(rm,i,0), sizeof(double)*rm->ncomp, |
478 |
< |
rm->ncols, fp) != rm->ncols) |
479 |
< |
return(0); |
480 |
< |
return(1); |
476 |
> |
if ((nc != 1) & (nc != 3)) return(0); |
477 |
> |
scan = (COLR *)tempbuffer(sizeof(COLR)*len); |
478 |
> |
if (!scan) return(0); |
479 |
> |
|
480 |
> |
for (j = 0; j < len; j++, dp += nc) |
481 |
> |
if (nc == 1) |
482 |
> |
setcolr(scan[j], dp[0], dp[0], dp[0]); |
483 |
> |
else |
484 |
> |
setcolr(scan[j], dp[0], dp[1], dp[2]); |
485 |
> |
|
486 |
> |
return(fwritecolrs(scan, len, fp) >= 0); |
487 |
|
} |
488 |
|
|
489 |
|
static int |
490 |
< |
rmx_write_rgbe(const RMATRIX *rm, FILE *fp) |
490 |
> |
rmx_write_spec(const double *dp, int nc, int len, FILE *fp) |
491 |
|
{ |
492 |
< |
COLR *scan = (COLR *)malloc(sizeof(COLR)*rm->ncols); |
493 |
< |
int i, j; |
492 |
> |
uby8 *scan; |
493 |
> |
SCOLOR scol; |
494 |
> |
int j, k; |
495 |
|
|
496 |
< |
if (!scan) |
497 |
< |
return(0); |
498 |
< |
for (i = 0; i < rm->nrows; i++) { |
499 |
< |
for (j = rm->ncols; j--; ) { |
500 |
< |
const double *dp = rmx_lval(rm,i,j); |
501 |
< |
if (rm->ncomp == 1) |
502 |
< |
setcolr(scan[j], dp[0], dp[0], dp[0]); |
441 |
< |
else |
442 |
< |
setcolr(scan[j], dp[0], dp[1], dp[2]); |
443 |
< |
} |
444 |
< |
if (fwritecolrs(scan, rm->ncols, fp) < 0) { |
445 |
< |
free(scan); |
446 |
< |
return(0); |
447 |
< |
} |
496 |
> |
if (nc < 3) return(0); |
497 |
> |
scan = (uby8 *)tempbuffer((nc+1)*len); |
498 |
> |
if (!scan) return(0); |
499 |
> |
for (j = len; j--; dp += nc) { |
500 |
> |
for (k = nc; k--; ) |
501 |
> |
scol[k] = dp[k]; |
502 |
> |
scolor2scolr(scan+j*(nc+1), scol, nc); |
503 |
|
} |
504 |
< |
free(scan); |
450 |
< |
return(1); |
504 |
> |
return(fwritescolrs(scan, nc, len, fp) >= 0); |
505 |
|
} |
506 |
|
|
507 |
|
/* Check if CIE XYZ primaries were specified */ |
521 |
|
(prims[BLU][CIEX] < .01) & (prims[BLU][CIEY] < .01)); |
522 |
|
} |
523 |
|
|
524 |
< |
/* Write matrix to file type indicated by dtype */ |
524 |
> |
/* Finish writing header data with resolution and format, returning type used */ |
525 |
|
int |
526 |
< |
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
526 |
> |
rmx_write_header(const RMATRIX *rm, int dtype, FILE *fp) |
527 |
|
{ |
528 |
< |
int ok = 1; |
475 |
< |
|
476 |
< |
if (!rm | !fp || !rm->mtx) |
528 |
> |
if (!rm | !fp || !rm->mtx | (rm->ncols <= 0)) |
529 |
|
return(0); |
478 |
– |
#ifdef getc_unlocked |
479 |
– |
flockfile(fp); |
480 |
– |
#endif |
481 |
– |
/* complete header */ |
530 |
|
if (rm->info) |
531 |
|
fputs(rm->info, fp); |
532 |
|
if (dtype == DTfromHeader) |
536 |
|
dtype = DTxyze; |
537 |
|
else if ((dtype == DTxyze) & (rm->dtype == DTrgbe)) |
538 |
|
dtype = DTrgbe; |
539 |
< |
if (rm->ncomp == 3) { /* write exposure? */ |
540 |
< |
if ((rm->cexp[RED] != rm->cexp[GRN]) | |
541 |
< |
(rm->cexp[GRN] != rm->cexp[BLU])) |
542 |
< |
fputcolcor(rm->cexp, fp); |
543 |
< |
else if (rm->cexp[GRN] != 1.f) |
544 |
< |
fputexpos(rm->cexp[GRN], fp); |
545 |
< |
} |
546 |
< |
if ((dtype != DTrgbe) & (dtype != DTxyze)) { |
547 |
< |
fprintf(fp, "NROWS=%d\n", rm->nrows); |
539 |
> |
if ((dtype == DTspec) & (rm->ncomp < 3)) |
540 |
> |
return(0); |
541 |
> |
|
542 |
> |
if (dtype == DTascii) /* set file type (WINDOWS) */ |
543 |
> |
SET_FILE_TEXT(fp); |
544 |
> |
else |
545 |
> |
SET_FILE_BINARY(fp); |
546 |
> |
/* write exposure? */ |
547 |
> |
if (rm->ncomp == 3 && (rm->cexp[RED] != rm->cexp[GRN]) | |
548 |
> |
(rm->cexp[GRN] != rm->cexp[BLU])) |
549 |
> |
fputcolcor(rm->cexp, fp); |
550 |
> |
else if (rm->cexp[GRN] != 1.f) |
551 |
> |
fputexpos(rm->cexp[GRN], fp); |
552 |
> |
/* matrix size? */ |
553 |
> |
if ((dtype > DTspec) | (rm->nrows <= 0)) { |
554 |
> |
if (rm->nrows > 0) |
555 |
> |
fprintf(fp, "NROWS=%d\n", rm->nrows); |
556 |
|
fprintf(fp, "NCOLS=%d\n", rm->ncols); |
557 |
< |
fprintf(fp, "NCOMP=%d\n", rm->ncomp); |
557 |
> |
} |
558 |
> |
if (dtype >= DTspec) { /* # components & split? */ |
559 |
> |
fputncomp(rm->ncomp, fp); |
560 |
> |
if (dtype == DTspec || (rm->ncomp > 3 && |
561 |
> |
memcmp(rm->wlpart, WLPART, sizeof(WLPART)))) |
562 |
> |
fputwlsplit(rm->wlpart, fp); |
563 |
|
} else if ((rm->ncomp != 3) & (rm->ncomp != 1)) |
564 |
|
return(0); /* wrong # components */ |
565 |
|
if ((dtype == DTfloat) | (dtype == DTdouble)) |
566 |
|
fputendian(fp); /* important to record */ |
567 |
|
fputformat(cm_fmt_id[dtype], fp); |
568 |
< |
fputc('\n', fp); |
569 |
< |
switch (dtype) { /* write data */ |
568 |
> |
fputc('\n', fp); /* end of header */ |
569 |
> |
if ((dtype <= DTspec) & (rm->nrows > 0)) |
570 |
> |
fprtresolu(rm->ncols, rm->nrows, fp); |
571 |
> |
return(dtype); |
572 |
> |
} |
573 |
> |
|
574 |
> |
/* Write out matrix data (usually by row) */ |
575 |
> |
int |
576 |
> |
rmx_write_data(const double *dp, int nc, int len, int dtype, FILE *fp) |
577 |
> |
{ |
578 |
> |
switch (dtype) { |
579 |
|
case DTascii: |
580 |
< |
ok = rmx_write_ascii(rm, fp); |
511 |
< |
break; |
580 |
> |
return(rmx_write_ascii(dp, nc, len, fp)); |
581 |
|
case DTfloat: |
582 |
< |
ok = rmx_write_float(rm, fp); |
514 |
< |
break; |
582 |
> |
return(rmx_write_float(dp, nc*len, fp)); |
583 |
|
case DTdouble: |
584 |
< |
ok = rmx_write_double(rm, fp); |
517 |
< |
break; |
584 |
> |
return(putbinary(dp, sizeof(*dp)*nc, len, fp) == len); |
585 |
|
case DTrgbe: |
586 |
|
case DTxyze: |
587 |
< |
fprtresolu(rm->ncols, rm->nrows, fp); |
588 |
< |
ok = rmx_write_rgbe(rm, fp); |
589 |
< |
break; |
523 |
< |
default: |
524 |
< |
return(0); |
587 |
> |
return(rmx_write_rgbe(dp, nc, len, fp)); |
588 |
> |
case DTspec: |
589 |
> |
return(rmx_write_spec(dp, nc, len, fp)); |
590 |
|
} |
591 |
< |
ok &= (fflush(fp) == 0); |
591 |
> |
return(0); |
592 |
> |
} |
593 |
> |
|
594 |
> |
/* Write matrix using file format indicated by dtype */ |
595 |
> |
int |
596 |
> |
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
597 |
> |
{ |
598 |
> |
int ok = 0; |
599 |
> |
int i; |
600 |
> |
/* complete header */ |
601 |
> |
dtype = rmx_write_header(rm, dtype, fp); |
602 |
> |
if (dtype <= 0) |
603 |
> |
return(0); |
604 |
|
#ifdef getc_unlocked |
605 |
+ |
flockfile(fp); |
606 |
+ |
#endif |
607 |
+ |
if (dtype == DTdouble) /* write all at once? */ |
608 |
+ |
ok = rmx_write_data(rm->mtx, rm->ncomp, |
609 |
+ |
rm->nrows*rm->ncols, dtype, fp); |
610 |
+ |
else /* else row by row */ |
611 |
+ |
for (i = 0; i < rm->nrows; i++) { |
612 |
+ |
ok = rmx_write_data(rmx_val(rm,i,0), rm->ncomp, |
613 |
+ |
rm->ncols, dtype, fp); |
614 |
+ |
if (!ok) break; |
615 |
+ |
} |
616 |
+ |
|
617 |
+ |
if (ok) ok = (fflush(fp) == 0); |
618 |
+ |
#ifdef getc_unlocked |
619 |
|
funlockfile(fp); |
620 |
|
#endif |
621 |
+ |
if (!ok) fputs("Error writing matrix\n", stderr); |
622 |
|
return(ok); |
623 |
|
} |
624 |
|
|
646 |
|
{ |
647 |
|
RMATRIX *dnew; |
648 |
|
|
649 |
< |
if (!rm) |
649 |
> |
if (!rm || !rm->mtx) |
650 |
|
return(NULL); |
651 |
|
dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp); |
652 |
|
if (!dnew) |
653 |
|
return(NULL); |
654 |
|
rmx_addinfo(dnew, rm->info); |
655 |
|
dnew->dtype = rm->dtype; |
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 |
|
} |
666 |
|
RMATRIX *dnew; |
667 |
|
int i, j; |
668 |
|
|
669 |
< |
if (!rm) |
669 |
> |
if (!rm || !rm->mtx) |
670 |
|
return(0); |
671 |
|
if ((rm->nrows == 1) | (rm->ncols == 1)) { |
672 |
|
dnew = rmx_copy(rm); |
684 |
|
rmx_addinfo(dnew, "Transposed rows and columns\n"); |
685 |
|
} |
686 |
|
dnew->dtype = rm->dtype; |
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), |
691 |
> |
memcpy(rmx_lval(dnew,i,j), rmx_val(rm,j,i), |
692 |
|
sizeof(double)*dnew->ncomp); |
693 |
|
return(dnew); |
694 |
|
} |
700 |
|
RMATRIX *mres; |
701 |
|
int i, j, k, h; |
702 |
|
|
703 |
< |
if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
703 |
> |
if (!m1 | !m2 || !m1->mtx | !m2->mtx | |
704 |
> |
(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
705 |
|
return(NULL); |
706 |
|
mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp); |
707 |
|
if (!mres) |
716 |
|
for (k = mres->ncomp; k--; ) { |
717 |
|
double d = 0; |
718 |
|
for (h = m1->ncols; h--; ) |
719 |
< |
d += rmx_lval(m1,i,h)[k] * rmx_lval(m2,h,j)[k]; |
719 |
> |
d += rmx_val(m1,i,h)[k] * rmx_val(m2,h,j)[k]; |
720 |
|
rmx_lval(mres,i,j)[k] = d; |
721 |
|
} |
722 |
|
return(mres); |
729 |
|
int zeroDivides = 0; |
730 |
|
int i, j, k; |
731 |
|
|
732 |
< |
if (!m1 | !m2 || (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
732 |
> |
if (!m1 | !m2 || !m1->mtx | !m2->mtx | |
733 |
> |
(m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
734 |
|
return(0); |
735 |
|
if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp)) |
736 |
|
return(0); |
744 |
|
if (divide) { |
745 |
|
double d; |
746 |
|
if (m2->ncomp == 1) { |
747 |
< |
d = rmx_lval(m2,i,j)[0]; |
747 |
> |
d = rmx_val(m2,i,j)[0]; |
748 |
|
if (d == 0) { |
749 |
|
++zeroDivides; |
750 |
|
for (k = m1->ncomp; k--; ) |
756 |
|
} |
757 |
|
} else |
758 |
|
for (k = m1->ncomp; k--; ) { |
759 |
< |
d = rmx_lval(m2,i,j)[k]; |
759 |
> |
d = rmx_val(m2,i,j)[k]; |
760 |
|
if (d == 0) { |
761 |
|
++zeroDivides; |
762 |
|
rmx_lval(m1,i,j)[k] = 0; |
765 |
|
} |
766 |
|
} else { |
767 |
|
if (m2->ncomp == 1) { |
768 |
< |
const double d = rmx_lval(m2,i,j)[0]; |
768 |
> |
const double d = rmx_val(m2,i,j)[0]; |
769 |
|
for (k = m1->ncomp; k--; ) |
770 |
|
rmx_lval(m1,i,j)[k] *= d; |
771 |
|
} else |
772 |
|
for (k = m1->ncomp; k--; ) |
773 |
< |
rmx_lval(m1,i,j)[k] *= rmx_lval(m2,i,j)[k]; |
773 |
> |
rmx_lval(m1,i,j)[k] *= rmx_val(m2,i,j)[k]; |
774 |
|
} |
775 |
|
if (zeroDivides) { |
776 |
|
rmx_addinfo(m1, "WARNING: zero divide(s) corrupted results\n"); |
786 |
|
double *mysf = NULL; |
787 |
|
int i, j, k; |
788 |
|
|
789 |
< |
if (!msum | !madd || |
789 |
> |
if (!msum | !madd || !msum->mtx | !madd->mtx | |
790 |
|
(msum->nrows != madd->nrows) | |
791 |
|
(msum->ncols != madd->ncols) | |
792 |
|
(msum->ncomp != madd->ncomp)) |
806 |
|
rmx_addinfo(msum, rmx_mismatch_warn); |
807 |
|
for (i = msum->nrows; i--; ) |
808 |
|
for (j = msum->ncols; j--; ) { |
809 |
< |
const double *da = rmx_lval(madd,i,j); |
809 |
> |
const double *da = rmx_val(madd,i,j); |
810 |
|
double *ds = rmx_lval(msum,i,j); |
811 |
|
for (k = msum->ncomp; k--; ) |
812 |
|
ds[k] += sf[k] * da[k]; |
822 |
|
{ |
823 |
|
int i, j, k; |
824 |
|
|
825 |
< |
if (!rm | !sf) |
825 |
> |
if (!rm | !sf || !rm->mtx) |
826 |
|
return(0); |
827 |
|
for (i = rm->nrows; i--; ) |
828 |
|
for (j = rm->ncols; j--; ) { |
832 |
|
} |
833 |
|
if (rm->info) |
834 |
|
rmx_addinfo(rm, "Applied scalar\n"); |
835 |
+ |
/* XXX: should record as exposure for COLR and SCOLR types? */ |
836 |
|
return(1); |
837 |
|
} |
838 |
|
|
843 |
|
int i, j, ks, kd; |
844 |
|
RMATRIX *dnew; |
845 |
|
|
846 |
< |
if (!msrc | (n <= 0) | !cmat) |
846 |
> |
if (!msrc | (n <= 0) | !cmat || !msrc->mtx) |
847 |
|
return(NULL); |
848 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
849 |
|
if (!dnew) |
858 |
|
dnew->dtype = msrc->dtype; |
859 |
|
for (i = dnew->nrows; i--; ) |
860 |
|
for (j = dnew->ncols; j--; ) { |
861 |
< |
const double *ds = rmx_lval(msrc,i,j); |
861 |
> |
const double *ds = rmx_val(msrc,i,j); |
862 |
|
for (kd = dnew->ncomp; kd--; ) { |
863 |
|
double d = 0; |
864 |
|
for (ks = msrc->ncomp; ks--; ) |
900 |
|
int i, j; |
901 |
|
CMATRIX *cnew; |
902 |
|
|
903 |
< |
if (!rm || !rm->mtx | ((rm->ncomp != 3) & (rm->ncomp != 1))) |
903 |
> |
if (!rm || !rm->mtx | (rm->ncomp == 2)) |
904 |
|
return(NULL); |
905 |
|
cnew = cm_alloc(rm->nrows, rm->ncols); |
906 |
|
if (!cnew) |
907 |
|
return(NULL); |
908 |
|
for (i = cnew->nrows; i--; ) |
909 |
|
for (j = cnew->ncols; j--; ) { |
910 |
< |
const double *dp = rmx_lval(rm,i,j); |
910 |
> |
const double *dp = rmx_val(rm,i,j); |
911 |
|
COLORV *cv = cm_lval(cnew,i,j); |
912 |
< |
if (rm->ncomp == 1) |
913 |
< |
setcolor(cv, dp[0], dp[0], dp[0]); |
815 |
< |
else |
912 |
> |
switch (rm->ncomp) { |
913 |
> |
case 3: |
914 |
|
setcolor(cv, dp[0], dp[1], dp[2]); |
915 |
+ |
break; |
916 |
+ |
case 1: |
917 |
+ |
setcolor(cv, dp[0], dp[0], dp[0]); |
918 |
+ |
break; |
919 |
+ |
default: { |
920 |
+ |
SCOLOR scol; |
921 |
+ |
int k; |
922 |
+ |
for (k = rm->ncomp; k--; ) |
923 |
+ |
scol[k] = dp[k]; |
924 |
+ |
scolor2color(cv, scol, rm->ncomp, rm->wlpart); |
925 |
+ |
} break; |
926 |
+ |
} |
927 |
|
} |
928 |
|
return(cnew); |
929 |
|
} |