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)) |
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 |
|
|
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); |
466 |
|
|
467 |
|
if (rm == NULL) |
468 |
|
return(0); |
469 |
+ |
if ((rm->nrows == 1) | (rm->ncols == 1)) { |
470 |
+ |
dnew = rmx_copy(rm); |
471 |
+ |
if (dnew == NULL) |
472 |
+ |
return(NULL); |
473 |
+ |
dnew->nrows = rm->ncols; |
474 |
+ |
dnew->ncols = rm->nrows; |
475 |
+ |
return(dnew); |
476 |
+ |
} |
477 |
|
dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp); |
478 |
|
if (dnew == NULL) |
479 |
|
return(NULL); |