ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/rcrop.c

Comparing ray/src/util/rcrop.c (file contents):
Revision 1.11 by greg, Wed Mar 16 16:48:39 2022 UTC vs.
Revision 1.15 by greg, Thu May 16 18:59:19 2024 UTC

#	Line 27 | Line 27 | headline(char *s, void *p)
27		{
28		if (formatval(fmt, s))
29		return(0);
30	<	if (!strncmp(s, "NCOMP=", 6)) {
31	<	ncomp = atoi(s+6);
30	>	if (isncomp(s)) {
31	>	ncomp = ncompval(s);
32		return(-(ncomp <= 0));
33		}
34		if (!strncmp(s, "NROWS=", 6)) {
#	Line 97 | Line 97 | binary_copyf(FILE *fp, int asize)
97		int             y;
98		/* check if fseek() useful */
99		if (skip_len > skip_thresh &&
100	<	fseek(fp, (rmin*width + cmin)*elsiz, SEEK_CUR) == 0) {
100	>	fseek(fp, ((long)rmin*width + cmin)*elsiz, SEEK_CUR) == 0) {
101	>	off_t   curpos;
102		buf = (char *)malloc(ncols*elsiz);
103		if (!buf)
104		goto memerr;
105	+	#ifdef NON_POSIX
106		for (y = nrows; y-- > 0; ) {
107		if (getbinary(buf, elsiz, ncols, fp) != ncols)
108		goto readerr;
#	Line 112 | Line 114 | binary_copyf(FILE *fp, int asize)
114		return(0);
115		}
116		}
117	<	free(buf);              /* success! */
118	<	return(1);
117	>	#else
118	>	curpos = ftello(fp);
119	>	for (y = nrows; y-- > 0; curpos += width*elsiz) {
120	>	if (pread(fileno(fp), buf, ncols*elsiz,
121	>	curpos) != ncols*elsiz)
122	>	goto readerr;
123	>	if (putbinary(buf, elsiz, ncols, stdout) != ncols)
124	>	goto writerr;
125	>	}
126	>	#endif
127	>	free(buf);
128	>	if (fflush(stdout) == EOF)
129	>	goto writerr;
130	>	return(1);              /* success! */
131		}                               /* else need to read it all... */
132		buf = (char *)malloc(width*elsiz);
133		if (!buf)
134		goto memerr;
135		/* skip rows as requested */
136		if (skip_len > skip_thresh ||
137	<	(rmin && fseek(fp, rmin*width*elsiz, SEEK_CUR) < 0))
137	>	(rmin && fseek(fp, (long)rmin*width*elsiz, SEEK_CUR) < 0))
138		for (y = 0; y < rmin; y++)
139		if (getbinary(buf, elsiz, width, fp) != width)
140		goto readerr;
#	Line 149 | Line 163 | memerr:
163
164		/* Read (and copy) specified number of white-space-separated words */
165		static int
166	<	readwords(FILE *finp, int nwords, FILE *fout)
166	>	readwords(FILE *finp, long nwords, FILE *fout)
167		{
168		while (nwords-- > 0) {
169		int     c;
#	Line 178 | Line 192 | ascii_copyf(FILE *fp)
192		SET_FILE_TEXT(fp);              /* started as binary */
193		SET_FILE_TEXT(stdout);
194		/* skip rows as requested */
195	<	if (readwords(fp, rmin*width*ncomp, NULL) < 0)
195	>	if (readwords(fp, (long)rmin*width*ncomp, NULL) < 0)
196		goto io_err;
197		for (y = 0; y < nrows; y++) {   /* copy part */
198		if (readwords(fp, cmin*ncomp, NULL) < 0)
#	Line 307 | Line 321 | main(int argc, char *argv[])
321		if (gotdims)                    /* dimensions + format */
322		printf("NROWS=%d\nNCOLS=%d\n", nrows, ncols);
323		if (ncomp)
324	<	printf("NCOMP=%d\n", ncomp);
324	>	fputncomp(ncomp, stdout);
325		fputformat(fmt, stdout);        /* will align bytes if it can */
326		fputc('\n', stdout);            /* end of new header */
327		if (!gotdims) {                 /* add resolution string? */
#	Line 337 | Line 351 | main(int argc, char *argv[])
351		asiz = -1;
352		if (!ncomp) ncomp = 3;
353		else ncomp *= (ncomp == 3);
354	+	} else if (!strcmp(fmt, SPECFMT)) {
355	+	asiz = ncomp+1;
356	+	ncomp = 1;              /* XXX assumes uncompressed */
357		} else if (strcasecmp(fmt, "ascii")) {
358		fputs(progname, stderr);
359		fputs(": unsupported format - ", stderr);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)