ViewVC Help

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

root/Development/ray/src/common/idmap.c

Comparing ray/src/common/idmap.c (file contents):
Revision 2.1 by greg, Fri Jul 26 16:18:06 2019 UTC vs.
Revision 2.3 by greg, Wed Aug 24 19:55:58 2022 UTC

#	Line 30 | Line 30 | idmap_ropen(const char *fname, int hflags)
30		idinit.finp = fopen(fname, "rb");
31
32		if (!idinit.finp) {
33	<	fputs(fname, stderr);
34	<	fputs(": cannot open for reading\n", stderr);
33	>	if (hflags & HF_STDERR) {
34	>	fputs(fname, stderr);
35	>	fputs(": cannot open for reading\n", stderr);
36	>	}
37		return NULL;
38		}
39		SET_FILE_BINARY(idinit.finp);
#	Line 42 | Line 44 | idmap_ropen(const char *fname, int hflags)
44		gotfmt = checkheader(idinit.finp, infmt,
45		(hflags & HF_HEADOUT) ? stdout : (FILE *)NULL);
46		if (gotfmt <= 0) {
47	<	fputs(fname, stderr);
48	<	fputs(": bad or missing header format\n", stderr);
47	>	if (hflags & HF_STDERR) {
48	>	fputs(fname, stderr);
49	>	fputs(": bad or missing header format\n", stderr);
50	>	}
51		fclose(idinit.finp);
52		return NULL;
53		}
#	Line 62 | Line 66 | idmap_ropen(const char *fname, int hflags)
66		idinit.bytespi = 3;
67		break;
68		default:
69	<	fputs(fname, stderr);
70	<	fputs(": unsupported index size: ", stderr);
71	<	fputs(infmt, stderr);
72	<	fputc('\n', stderr);
69	>	if (hflags & HF_STDERR) {
70	>	fputs(fname, stderr);
71	>	fputs(": unsupported index size: ", stderr);
72	>	fputs(infmt, stderr);
73	>	fputc('\n', stderr);
74	>	}
75		fclose(idinit.finp);
76		return NULL;
77		}
78		/* get/copy resolution string */
79		if (!fgetsresolu(&idinit.res, idinit.finp)) {
80	<	fputs(fname, stderr);
81	<	fputs(": missing map resolution\n", stderr);
80	>	if (hflags & HF_STDERR) {
81	>	fputs(fname, stderr);
82	>	fputs(": missing map resolution\n", stderr);
83	>	}
84		fclose(idinit.finp);
85		return NULL;
86		}
#	Line 85 | Line 93 | idmap_ropen(const char *fname, int hflags)
93		tablength = ftell(idinit.finp) - idinit.dstart -
94		(long)idinit.res.xr*idinit.res.yr*idinit.bytespi;
95		if (tablength < 2) {
96	<	fputs(fname, stderr);
97	<	fputs(": truncated file\n", stderr);
96	>	if (hflags & HF_STDERR) {
97	>	fputs(fname, stderr);
98	>	fputs(": truncated file\n", stderr);
99	>	}
100		fclose(idinit.finp);
101		return NULL;
102		}
103		/* allocate and load table */
104		idmp = (IDMAP *)malloc(sizeof(IDMAP)+tablength);
105		if (idmp == NULL) {
106	<	fputs("Out of memory allocating ID table!\n", stderr);
106	>	if (hflags & HF_STDERR)
107	>	fputs("Out of memory allocating ID table!\n", stderr);
108		fclose(idinit.finp);
109		return NULL;
110		}
#	Line 102 | Line 113 | idmap_ropen(const char *fname, int hflags)
113		if (fseek(idmp->finp, -tablength, SEEK_END) < 0)
114		goto seekerr;
115		if (fread(idmp->idtable, 1, tablength, idmp->finp) != tablength) {
116	<	fputs(fname, stderr);
117	<	fputs(": error reading identifier table\n", stderr);
116	>	if (hflags & HF_STDERR) {
117	>	fputs(fname, stderr);
118	>	fputs(": error reading identifier table\n", stderr);
119	>	}
120		fclose(idmp->finp);
121		free(idmp);
122		return NULL;
123		}
124	<	if (fseek(idmp->finp, idmp->curpos = idmp->dstart, SEEK_SET) < 0)
124	>	if (fseek(idmp->finp, idmp->dstart, SEEK_SET) < 0)
125		goto seekerr;
126		while (tablength > 0)           /* create index */
127		idmp->nids += !idmp->idtable[--tablength];
128		idmp->idoffset = (int *)malloc(sizeof(int)*idmp->nids);
129		if (!idmp->idoffset) {
130	<	fputs("Out of memory in idmap_ropen!\n", stderr);
130	>	if (hflags & HF_STDERR)
131	>	fputs("Out of memory in idmap_ropen!\n", stderr);
132		fclose(idmp->finp);
133		free(idmp);
134		return NULL;
#	Line 126 | Line 140 | idmap_ropen(const char *fname, int hflags)
140		}
141		return idmp;
142		seekerr:
143	<	fputs(fname, stderr);
144	<	fputs(": cannot seek on file\n", stderr);
143	>	if (hflags & HF_STDERR) {
144	>	fputs(fname, stderr);
145	>	fputs(": cannot seek on file\n", stderr);
146	>	}
147		fclose(idinit.finp);
148		if (idmp) free(idmp);
149		return NULL;
#	Line 143 | Line 159 | idmap_next_i(IDMAP *idmp)
159		if (ndx == EOF && feof(idmp->finp))
160		return -1;
161
146	–	idmp->curpos += idmp->bytespi;
147	–
162		ndx &= (1<<(idmp->bytespi<<3)) - 1;     /* undo sign extension */
163
164		return ndx;
#	Line 168 | Line 182 | idmap_next(IDMAP *idmp)
182		int
183		idmap_seek(IDMAP *idmp, int x, int y)
184		{
171	–	long    seekto;
172	–
185		if ((x < 0) | (y < 0) | (x >= idmp->res.xr) | (y >= idmp->res.yr))
186		return 0;
187
188	<	seekto = idmp->dstart + ((long)y*idmp->res.xr + x)*idmp->bytespi;
189	<
178	<	if (seekto != idmp->curpos && fseek(idmp->finp, seekto, SEEK_SET) < 0)
188	>	if (fseek(idmp->finp, idmp->dstart + ((long)y*idmp->res.xr + x)*idmp->bytespi,
189	>	SEEK_SET) < 0)
190		return -1;
191
181	–	idmp->curpos = seekto;
182	–
192		return 1;
193		}
194

Diff Legend

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