48 |
|
error(SYSTEM, errmsg); |
49 |
|
} |
50 |
|
dt = DTfromHeader; |
51 |
< |
if ((err = cm_getheader(&dt, NULL, NULL, NULL, fp)) != NULL) |
51 |
> |
if ((err = cm_getheader(&dt, NULL, NULL, NULL, NULL, fp)) != NULL) |
52 |
|
error(USER, err); |
53 |
|
if ((dt != DTrgbe) & (dt != DTxyze) || |
54 |
|
!fscnresolu(&xr, &yr, fp)) { |
64 |
|
pmat = cm_alloc(myYR, myXR); |
65 |
|
memset(pmat->cmem, 0, sizeof(COLOR)*myXR*myYR); |
66 |
|
/* finish header */ |
67 |
< |
fputformat((char *)cm_fmt_id[myDT], fout); |
67 |
> |
fputformat(cm_fmt_id[myDT], fout); |
68 |
|
fputc('\n', fout); |
69 |
|
fflush(fout); |
70 |
|
} else if ((dt != myDT) | (xr != myXR) | (yr != myYR)) { |
308 |
|
fputs("NCOLS=1\nNCOMP=3\n", ofp); |
309 |
|
if ((outfmt == 'f') | (outfmt == 'd')) |
310 |
|
fputendian(ofp); |
311 |
< |
fputformat((char *)cm_fmt_id[outfmt], ofp); |
311 |
> |
fputformat(cm_fmt_id[outfmt], ofp); |
312 |
|
fputc('\n', ofp); |
313 |
|
} |
314 |
|
cm_write(rvec, outfmt, ofp); |
336 |
|
fputs("NCOMP=3\n", ofp); |
337 |
|
if ((outfmt == 'f') | (outfmt == 'd')) |
338 |
|
fputendian(ofp); |
339 |
< |
fputformat((char *)cm_fmt_id[outfmt], ofp); |
339 |
> |
fputformat(cm_fmt_id[outfmt], ofp); |
340 |
|
fputc('\n', ofp); |
341 |
|
} |
342 |
|
cm_write(rmtx, outfmt, ofp); |