59 |
|
{ |
60 |
|
if (!info || !*info) |
61 |
|
return(0); |
62 |
< |
if (!rm->info) |
62 |
> |
if (!rm->info) { |
63 |
|
rm->info = (char *)malloc(strlen(info)+1); |
64 |
< |
else |
64 |
> |
if (rm->info) rm->info[0] = '\0'; |
65 |
> |
} else |
66 |
|
rm->info = (char *)realloc(rm->info, |
67 |
|
strlen(rm->info)+strlen(info)+1); |
68 |
|
if (!rm->info) |
192 |
|
|
193 |
|
if (fname == NULL) { /* reading from stdin? */ |
194 |
|
fname = "<stdin>"; |
195 |
+ |
#ifdef _WIN32 |
196 |
+ |
_setmode(fileno(stdin), _O_BINARY); |
197 |
+ |
#endif |
198 |
|
} else { |
199 |
|
const char *sp = fname; /* check suffix */ |
200 |
|
while (*sp) |
356 |
|
} |
357 |
|
|
358 |
|
/* Write matrix to file type indicated by dtype */ |
359 |
< |
long |
359 |
> |
int |
360 |
|
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
361 |
|
{ |
362 |
|
RMATRIX *mydm = NULL; |
371 |
|
dtype = rm->dtype; |
372 |
|
else if ((dtype == DTrgbe) & (rm->dtype == DTxyze)) |
373 |
|
dtype = DTxyze; |
374 |
< |
else if ((dtype = DTxyze) & (rm->dtype == DTrgbe)) |
374 |
> |
else if ((dtype == DTxyze) & (rm->dtype == DTrgbe)) |
375 |
|
dtype = DTrgbe; |
376 |
|
if ((dtype != DTrgbe) & (dtype != DTxyze)) { |
377 |
|
fprintf(fp, "NROWS=%d\n", rm->nrows); |
409 |
|
} |
410 |
|
ok &= (fflush(fp) == 0); |
411 |
|
rmx_free(mydm); |
412 |
< |
return(ftell(fp) * ok); /* return # bytes written */ |
412 |
> |
return(ok); |
413 |
|
} |
414 |
|
|
415 |
|
/* Allocate and assign square identity matrix with n components */ |
492 |
|
rmx_addinfo(mres, rmx_mismatch_warn); |
493 |
|
for (i = mres->nrows; i--; ) |
494 |
|
for (j = mres->ncols; j--; ) |
495 |
< |
for (h = m1->ncols; h--; ) { |
495 |
> |
for (k = mres->ncomp; k--; ) { |
496 |
|
long double d = 0; |
497 |
< |
for (k = mres->ncomp; k--; ) |
497 |
> |
for (h = m1->ncols; h--; ) |
498 |
|
d += (long double)rmx_lval(m1,i,h,k) * |
499 |
|
(long double)rmx_lval(m2,h,j,k); |
500 |
|
rmx_lval(mres,i,j,k) = (double)d; |