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 |
|
|
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++) { |
183 |
< |
double *dp = rmx_lval(rm,i,j); |
184 |
< |
for (k = 0; k < rm->ncomp; k++) |
185 |
< |
if (fscanf(fp, "%lf", &dp[k]) != 1) |
186 |
< |
return(0); |
187 |
< |
} |
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)) |
202 |
< |
return(0); |
203 |
< |
for (i = 0; i < rm->nrows; i++) |
204 |
< |
for (j = 0; j < rm->ncols; j++) { |
205 |
< |
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 |
< |
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 |
< |
#endif |
233 |
< |
if (!rmx_prepare(rm)) |
224 |
> |
if (getbinary(drp, sizeof(*drp)*rm->ncomp, rm->ncols, fp) != rm->ncols) |
225 |
|
return(0); |
226 |
< |
for (i = 0; i < rm->nrows; i++) { |
227 |
< |
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 |
< |
} |
226 |
> |
if (rm->swapin) |
227 |
> |
swap64((char *)drp, rm->ncols*rm->ncomp); |
228 |
|
return(1); |
229 |
|
} |
230 |
|
|
231 |
|
static int |
232 |
< |
rmx_load_rgbe(RMATRIX *rm, FILE *fp) |
232 |
> |
rmx_load_rgbe(double *drp, const RMATRIX *rm, FILE *fp) |
233 |
|
{ |
234 |
< |
COLOR *scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols); |
235 |
< |
int i, j; |
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 (!rmx_prepare(rm)) { |
254 |
< |
free(scan); |
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 |
|
} |
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 = 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); |
251 |
|
return(1); |
252 |
|
} |
253 |
|
|
254 |
|
static int |
255 |
< |
rmx_load_spec(RMATRIX *rm, FILE *fp) |
255 |
> |
rmx_load_spec(double *drp, const RMATRIX *rm, FILE *fp) |
256 |
|
{ |
257 |
|
uby8 *scan; |
258 |
|
SCOLOR scol; |
259 |
< |
int i, j, k; |
259 |
> |
int j, k; |
260 |
|
|
261 |
< |
if (rm->ncomp < 3) |
261 |
> |
if ((rm->ncomp < 3) | (rm->ncomp > MAXCSAMP)) |
262 |
|
return(0); |
263 |
< |
scan = (uby8 *)malloc((rm->ncomp+1)*rm->ncols); |
263 |
> |
scan = (uby8 *)tempbuffer((rm->ncomp+1)*rm->ncols); |
264 |
|
if (!scan) |
265 |
|
return(0); |
266 |
< |
if (!rmx_prepare(rm)) { |
286 |
< |
free(scan); |
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 |
|
} |
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); |
273 |
|
return(1); |
274 |
|
} |
275 |
|
|
279 |
|
{ |
280 |
|
if (!rm | !fp) |
281 |
|
return(0); |
282 |
< |
if (rm->info) { /* clear state */ |
312 |
< |
free(rm->info); |
313 |
< |
rm->info = NULL; |
314 |
< |
} |
315 |
< |
if (rm->mtx) { /* ...and data */ |
316 |
< |
#ifdef MAP_FILE |
317 |
< |
if (rm->mapped) { |
318 |
< |
munmap(rm->mapped, mapped_size(rm)); |
319 |
< |
rm->mapped = NULL; |
320 |
< |
} else |
321 |
< |
#endif |
322 |
< |
free(rm->mtx); |
323 |
< |
rm->mtx = NULL; |
324 |
< |
} |
282 |
> |
rmx_reset(rm); /* clear state */ |
283 |
|
if (rm->nrows | rm->ncols | !rm->dtype) { |
284 |
|
rm->nrows = rm->ncols = 0; |
285 |
|
rm->ncomp = 3; |
287 |
|
memcpy(rm->wlpart, WLPART, sizeof(rm->wlpart)); |
288 |
|
rm->swapin = 0; |
289 |
|
} |
332 |
– |
SET_FILE_BINARY(fp); |
290 |
|
rm->dtype = DTascii; /* assumed w/o FORMAT */ |
291 |
|
if (getheader(fp, get_dminfo, rm) < 0) { |
292 |
|
fputs("Unrecognized matrix format\n", stderr); |
300 |
|
rm->ncomp != 3) |
301 |
|
return(0); |
302 |
|
} |
303 |
+ |
if (rm->dtype == DTascii) /* set input type (WINDOWS) */ |
304 |
+ |
SET_FILE_TEXT(fp); |
305 |
+ |
else |
306 |
+ |
SET_FILE_BINARY(fp); |
307 |
|
return(1); |
308 |
|
} |
309 |
|
|
310 |
< |
/* Allocate & load post-header data from stream given type set in rm->dtype */ |
310 |
> |
/* Load next row as double (cannot be XML) */ |
311 |
|
int |
312 |
< |
rmx_load_data(RMATRIX *rm, FILE *fp) |
312 |
> |
rmx_load_row(double *drp, const RMATRIX *rm, FILE *fp) |
313 |
|
{ |
314 |
|
switch (rm->dtype) { |
315 |
|
case DTascii: |
316 |
< |
SET_FILE_TEXT(fp); |
356 |
< |
return(rmx_load_ascii(rm, fp)); |
316 |
> |
return(rmx_load_ascii(drp, rm, fp)); |
317 |
|
case DTfloat: |
318 |
< |
return(rmx_load_float(rm, fp)); |
318 |
> |
return(rmx_load_float(drp, rm, fp)); |
319 |
|
case DTdouble: |
320 |
< |
return(rmx_load_double(rm, fp)); |
320 |
> |
return(rmx_load_double(drp, rm, fp)); |
321 |
|
case DTrgbe: |
322 |
|
case DTxyze: |
323 |
< |
return(rmx_load_rgbe(rm, fp)); |
323 |
> |
return(rmx_load_rgbe(drp, rm, fp)); |
324 |
|
case DTspec: |
325 |
< |
return(rmx_load_spec(rm, fp)); |
325 |
> |
return(rmx_load_spec(drp, rm, fp)); |
326 |
|
default: |
327 |
< |
fputs("Unsupported data type in rmx_loaddata()\n", stderr); |
327 |
> |
fputs("Unsupported data type in rmx_load_row()\n", stderr); |
328 |
|
} |
329 |
|
return(0); |
330 |
|
} |
331 |
|
|
332 |
+ |
/* Allocate & load post-header data from stream given type set in rm->dtype */ |
333 |
+ |
int |
334 |
+ |
rmx_load_data(RMATRIX *rm, FILE *fp) |
335 |
+ |
{ |
336 |
+ |
int i; |
337 |
+ |
#ifdef MAP_FILE |
338 |
+ |
long pos; /* map memory for file > 1MB if possible */ |
339 |
+ |
if ((rm->dtype == DTdouble) & !rm->swapin && array_size(rm) >= 1L<<20 && |
340 |
+ |
(pos = ftell(fp)) >= 0 && !(pos % sizeof(double))) { |
341 |
+ |
rm->mapped = mmap(NULL, array_size(rm)+pos, PROT_READ|PROT_WRITE, |
342 |
+ |
MAP_PRIVATE, fileno(fp), 0); |
343 |
+ |
if (rm->mapped != MAP_FAILED) { |
344 |
+ |
rm->mtx = (double *)rm->mapped + pos/sizeof(double); |
345 |
+ |
return(1); |
346 |
+ |
} /* else fall back on reading into memory */ |
347 |
+ |
rm->mapped = NULL; |
348 |
+ |
} |
349 |
+ |
#endif |
350 |
+ |
if (!rmx_prepare(rm)) { /* need in-core matrix array */ |
351 |
+ |
fprintf(stderr, "Cannot allocate %g MByte matrix array\n", |
352 |
+ |
(1./(1L<<20))*(double)array_size(rm)); |
353 |
+ |
return(0); |
354 |
+ |
} |
355 |
+ |
for (i = 0; i < rm->nrows; i++) |
356 |
+ |
if (!rmx_load_row(rmx_lval(rm,i,0), rm, fp)) |
357 |
+ |
return(0); |
358 |
+ |
return(1); |
359 |
+ |
} |
360 |
+ |
|
361 |
|
/* Load matrix from supported file type */ |
362 |
|
RMATRIX * |
363 |
|
rmx_load(const char *inspec, RMPref rmp) |
374 |
|
fp = stdin; |
375 |
|
else if (inspec[0] == '!') |
376 |
|
fp = popen(inspec+1, "r"); |
377 |
< |
else { |
377 |
> |
else if (rmp != RMPnone) { |
378 |
|
const char *sp = inspec; /* check suffix */ |
379 |
|
while (*sp) |
380 |
|
++sp; |
397 |
|
#ifdef getc_unlocked |
398 |
|
flockfile(fp); |
399 |
|
#endif |
400 |
< |
/* load header info */ |
400 |
> |
SET_FILE_BINARY(fp); /* load header info */ |
401 |
|
if (!rmx_load_header(dnew = rmx_new(0,0,3), fp)) { |
402 |
|
fprintf(stderr, "Bad header in: %s\n", inspec); |
403 |
|
if (inspec[0] == '!') pclose(fp); |
445 |
|
} |
446 |
|
|
447 |
|
static int |
448 |
< |
rmx_write_ascii(const RMATRIX *rm, FILE *fp) |
448 |
> |
rmx_write_ascii(const double *dp, int nc, int len, FILE *fp) |
449 |
|
{ |
450 |
< |
const char *fmt = (rm->dtype == DTfloat) ? " %.7e" : |
451 |
< |
(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) | |
452 |
< |
(rm->dtype == DTspec) ? " %.3e" : " %.15e" ; |
453 |
< |
int i, j, k; |
465 |
< |
|
466 |
< |
for (i = 0; i < rm->nrows; i++) { |
467 |
< |
for (j = 0; j < rm->ncols; j++) { |
468 |
< |
const double *dp = rmx_val(rm,i,j); |
469 |
< |
for (k = 0; k < rm->ncomp; k++) |
470 |
< |
fprintf(fp, fmt, dp[k]); |
450 |
> |
while (len-- > 0) { |
451 |
> |
int k = nc; |
452 |
> |
while (nc-- > 0) |
453 |
> |
fprintf(fp, " %.7e", *dp++); |
454 |
|
fputc('\t', fp); |
472 |
– |
} |
473 |
– |
fputc('\n', fp); |
455 |
|
} |
456 |
< |
return(1); |
456 |
> |
return(fputc('\n', fp) != EOF); |
457 |
|
} |
458 |
|
|
459 |
|
static int |
460 |
< |
rmx_write_float(const RMATRIX *rm, FILE *fp) |
460 |
> |
rmx_write_float(const double *dp, int len, FILE *fp) |
461 |
|
{ |
462 |
< |
int i, j, k; |
482 |
< |
float val[100]; |
462 |
> |
float val; |
463 |
|
|
464 |
< |
if (rm->ncomp > 100) { |
465 |
< |
fputs("Unsupported # components in rmx_write_float()\n", stderr); |
466 |
< |
exit(1); |
487 |
< |
} |
488 |
< |
for (i = 0; i < rm->nrows; i++) |
489 |
< |
for (j = 0; j < rm->ncols; j++) { |
490 |
< |
const double *dp = rmx_val(rm,i,j); |
491 |
< |
for (k = rm->ncomp; k--; ) |
492 |
< |
val[k] = (float)dp[k]; |
493 |
< |
if (putbinary(val, sizeof(float), rm->ncomp, fp) != rm->ncomp) |
464 |
> |
while (len--) { |
465 |
> |
val = *dp++; |
466 |
> |
if (putbinary(&val, sizeof(float), 1, fp) != 1) |
467 |
|
return(0); |
468 |
< |
} |
468 |
> |
} |
469 |
|
return(1); |
470 |
|
} |
471 |
|
|
472 |
|
static int |
473 |
< |
rmx_write_double(const RMATRIX *rm, FILE *fp) |
473 |
> |
rmx_write_rgbe(const double *dp, int nc, int len, FILE *fp) |
474 |
|
{ |
475 |
< |
int i; |
475 |
> |
COLR *scan; |
476 |
> |
int j; |
477 |
|
|
478 |
< |
for (i = 0; i < rm->nrows; i++) |
479 |
< |
if (putbinary(rmx_val(rm,i,0), sizeof(double)*rm->ncomp, |
480 |
< |
rm->ncols, fp) != rm->ncols) |
507 |
< |
return(0); |
508 |
< |
return(1); |
509 |
< |
} |
478 |
> |
if ((nc != 1) & (nc != 3)) return(0); |
479 |
> |
scan = (COLR *)tempbuffer(sizeof(COLR)*len); |
480 |
> |
if (!scan) return(0); |
481 |
|
|
482 |
< |
static int |
483 |
< |
rmx_write_rgbe(const RMATRIX *rm, FILE *fp) |
513 |
< |
{ |
514 |
< |
COLR *scan = (COLR *)malloc(sizeof(COLR)*rm->ncols); |
515 |
< |
int i, j; |
516 |
< |
|
517 |
< |
if (!scan) |
518 |
< |
return(0); |
519 |
< |
for (i = 0; i < rm->nrows; i++) { |
520 |
< |
for (j = rm->ncols; j--; ) { |
521 |
< |
const double *dp = rmx_val(rm,i,j); |
522 |
< |
if (rm->ncomp == 1) |
482 |
> |
for (j = 0; j < len; j++, dp += nc) |
483 |
> |
if (nc == 1) |
484 |
|
setcolr(scan[j], dp[0], dp[0], dp[0]); |
485 |
|
else |
486 |
|
setcolr(scan[j], dp[0], dp[1], dp[2]); |
487 |
< |
} |
488 |
< |
if (fwritecolrs(scan, rm->ncols, fp) < 0) { |
528 |
< |
free(scan); |
529 |
< |
return(0); |
530 |
< |
} |
531 |
< |
} |
532 |
< |
free(scan); |
533 |
< |
return(1); |
487 |
> |
|
488 |
> |
return(fwritecolrs(scan, len, fp) >= 0); |
489 |
|
} |
490 |
|
|
491 |
|
static int |
492 |
< |
rmx_write_spec(const RMATRIX *rm, FILE *fp) |
492 |
> |
rmx_write_spec(const double *dp, int nc, int len, FILE *fp) |
493 |
|
{ |
494 |
< |
uby8 *scan = (uby8 *)malloc((rm->ncomp+1)*rm->ncols); |
540 |
< |
int ok = 1; |
494 |
> |
uby8 *scan; |
495 |
|
SCOLOR scol; |
496 |
< |
int i, j, k; |
496 |
> |
int j, k; |
497 |
|
|
498 |
< |
if (!scan) |
499 |
< |
return(0); |
500 |
< |
for (i = 0; i < rm->nrows; i++) { |
501 |
< |
for (j = rm->ncols; j--; ) { |
502 |
< |
const double *dp = rmx_val(rm,i,j); |
549 |
< |
for (k = rm->ncomp; k--; ) |
498 |
> |
if (nc < 3) return(0); |
499 |
> |
scan = (uby8 *)tempbuffer((nc+1)*len); |
500 |
> |
if (!scan) return(0); |
501 |
> |
for (j = len; j--; dp += nc) { |
502 |
> |
for (k = nc; k--; ) |
503 |
|
scol[k] = dp[k]; |
504 |
< |
scolor2scolr(scan+j*(rm->ncomp+1), scol, rm->ncomp); |
552 |
< |
} |
553 |
< |
if (fwritescolrs(scan, rm->ncomp, rm->ncols, fp) < 0) { |
554 |
< |
ok = 0; |
555 |
< |
break; |
556 |
< |
} |
504 |
> |
scolor2scolr(scan+j*(nc+1), scol, nc); |
505 |
|
} |
506 |
< |
free(scan); |
559 |
< |
return(ok); |
506 |
> |
return(fwritescolrs(scan, nc, len, fp) >= 0); |
507 |
|
} |
508 |
|
|
509 |
|
/* Check if CIE XYZ primaries were specified */ |
523 |
|
(prims[BLU][CIEX] < .01) & (prims[BLU][CIEY] < .01)); |
524 |
|
} |
525 |
|
|
526 |
< |
/* Write matrix to file type indicated by dtype */ |
526 |
> |
/* Finish writing header data with resolution and format, returning type used */ |
527 |
|
int |
528 |
< |
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
528 |
> |
rmx_write_header(const RMATRIX *rm, int dtype, FILE *fp) |
529 |
|
{ |
583 |
– |
int ok = 1; |
584 |
– |
|
530 |
|
if (!rm | !fp || !rm->mtx) |
531 |
|
return(0); |
532 |
< |
#ifdef getc_unlocked |
588 |
< |
flockfile(fp); |
589 |
< |
#endif |
590 |
< |
if (rm->info) /* complete header */ |
532 |
> |
if (rm->info) |
533 |
|
fputs(rm->info, fp); |
534 |
|
if (dtype == DTfromHeader) |
535 |
|
dtype = rm->dtype; |
538 |
|
dtype = DTxyze; |
539 |
|
else if ((dtype == DTxyze) & (rm->dtype == DTrgbe)) |
540 |
|
dtype = DTrgbe; |
541 |
+ |
|
542 |
+ |
if (dtype == DTascii) /* set output 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])) |
565 |
|
fputendian(fp); /* important to record */ |
566 |
|
fputformat(cm_fmt_id[dtype], fp); |
567 |
|
fputc('\n', fp); /* end of header */ |
568 |
< |
switch (dtype) { /* write data */ |
568 |
> |
if (dtype <= DTspec) |
569 |
> |
fprtresolu(rm->ncols, rm->nrows, fp); |
570 |
> |
return(dtype); |
571 |
> |
} |
572 |
> |
|
573 |
> |
/* Write out matrix data (usually by row) */ |
574 |
> |
int |
575 |
> |
rmx_write_data(const double *dp, int nc, int len, int dtype, FILE *fp) |
576 |
> |
{ |
577 |
> |
switch (dtype) { |
578 |
|
case DTascii: |
579 |
< |
ok = rmx_write_ascii(rm, fp); |
624 |
< |
break; |
579 |
> |
return(rmx_write_ascii(dp, nc, len, fp)); |
580 |
|
case DTfloat: |
581 |
< |
ok = rmx_write_float(rm, fp); |
627 |
< |
break; |
581 |
> |
return(rmx_write_float(dp, nc*len, fp)); |
582 |
|
case DTdouble: |
583 |
< |
ok = rmx_write_double(rm, fp); |
630 |
< |
break; |
583 |
> |
return(putbinary(dp, sizeof(*dp)*nc, len, fp) == len); |
584 |
|
case DTrgbe: |
585 |
|
case DTxyze: |
586 |
< |
fprtresolu(rm->ncols, rm->nrows, fp); |
634 |
< |
ok = rmx_write_rgbe(rm, fp); |
635 |
< |
break; |
586 |
> |
return(rmx_write_rgbe(dp, nc, len, fp)); |
587 |
|
case DTspec: |
588 |
< |
fprtresolu(rm->ncols, rm->nrows, fp); |
638 |
< |
ok = rmx_write_spec(rm, fp); |
639 |
< |
break; |
640 |
< |
default: |
641 |
< |
return(0); |
588 |
> |
return(rmx_write_spec(dp, nc, len, fp)); |
589 |
|
} |
590 |
< |
ok &= (fflush(fp) == 0); |
590 |
> |
return(0); |
591 |
> |
} |
592 |
> |
|
593 |
> |
/* Write matrix using file format indicated by dtype */ |
594 |
> |
int |
595 |
> |
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
596 |
> |
{ |
597 |
> |
int ok = 0; |
598 |
> |
int i; |
599 |
> |
/* complete header */ |
600 |
> |
dtype = rmx_write_header(rm, dtype, fp); |
601 |
> |
if (dtype <= 0) |
602 |
> |
return(0); |
603 |
|
#ifdef getc_unlocked |
604 |
+ |
flockfile(fp); |
605 |
+ |
#endif |
606 |
+ |
if (dtype == DTdouble) /* write all at once? */ |
607 |
+ |
ok = rmx_write_data(rm->mtx, rm->ncomp, |
608 |
+ |
rm->nrows*rm->ncols, dtype, fp); |
609 |
+ |
else /* else row by row */ |
610 |
+ |
for (i = 0; i < rm->nrows; i++) { |
611 |
+ |
ok = rmx_write_data(rmx_val(rm,i,0), rm->ncomp, |
612 |
+ |
rm->ncols, dtype, fp); |
613 |
+ |
if (!ok) break; |
614 |
+ |
} |
615 |
+ |
|
616 |
+ |
if (ok) ok = (fflush(fp) == 0); |
617 |
+ |
#ifdef getc_unlocked |
618 |
|
funlockfile(fp); |
619 |
|
#endif |
620 |
|
if (!ok) fputs("Error writing matrix\n", stderr); |
645 |
|
{ |
646 |
|
RMATRIX *dnew; |
647 |
|
|
648 |
< |
if (!rm) |
648 |
> |
if (!rm || !rm->mtx) |
649 |
|
return(NULL); |
650 |
|
dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp); |
651 |
|
if (!dnew) |
665 |
|
RMATRIX *dnew; |
666 |
|
int i, j; |
667 |
|
|
668 |
< |
if (!rm) |
668 |
> |
if (!rm || !rm->mtx) |
669 |
|
return(0); |
670 |
|
if ((rm->nrows == 1) | (rm->ncols == 1)) { |
671 |
|
dnew = rmx_copy(rm); |
699 |
|
RMATRIX *mres; |
700 |
|
int i, j, k, h; |
701 |
|
|
702 |
< |
if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
702 |
> |
if (!m1 | !m2 || !m1->mtx | !m2->mtx | |
703 |
> |
(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows)) |
704 |
|
return(NULL); |
705 |
|
mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp); |
706 |
|
if (!mres) |
728 |
|
int zeroDivides = 0; |
729 |
|
int i, j, k; |
730 |
|
|
731 |
< |
if (!m1 | !m2 || (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
731 |
> |
if (!m1 | !m2 || !m1->mtx | !m2->mtx | |
732 |
> |
(m1->ncols != m2->ncols) | (m1->nrows != m2->nrows)) |
733 |
|
return(0); |
734 |
|
if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp)) |
735 |
|
return(0); |
785 |
|
double *mysf = NULL; |
786 |
|
int i, j, k; |
787 |
|
|
788 |
< |
if (!msum | !madd || |
788 |
> |
if (!msum | !madd || !msum->mtx | !madd->mtx | |
789 |
|
(msum->nrows != madd->nrows) | |
790 |
|
(msum->ncols != madd->ncols) | |
791 |
|
(msum->ncomp != madd->ncomp)) |
821 |
|
{ |
822 |
|
int i, j, k; |
823 |
|
|
824 |
< |
if (!rm | !sf) |
824 |
> |
if (!rm | !sf || !rm->mtx) |
825 |
|
return(0); |
826 |
|
for (i = rm->nrows; i--; ) |
827 |
|
for (j = rm->ncols; j--; ) { |
842 |
|
int i, j, ks, kd; |
843 |
|
RMATRIX *dnew; |
844 |
|
|
845 |
< |
if (!msrc | (n <= 0) | !cmat) |
845 |
> |
if (!msrc | (n <= 0) | !cmat || !msrc->mtx) |
846 |
|
return(NULL); |
847 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
848 |
|
if (!dnew) |