ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/header.c
(Generate patch)

Comparing ray/src/common/header.c (file contents):
Revision 2.35 by greg, Fri Jul 19 17:37:56 2019 UTC vs.
Revision 2.41 by greg, Thu Mar 3 03:55:12 2022 UTC

# Line 15 | Line 15 | static const char      RCSid[] = "$Id$";
15   *  printargs(ac,av,fp) print an argument list to fp, followed by '\n'
16   *  formatval(r,s)      copy the format value in s to r
17   *  fputformat(s,fp)    write "FORMAT=%s" to fp
18 + *  nativebigendian()   are we native on big-endian machine?
19 + *  isbigendian(s)      header line matches "BigEndian=1" (-1 if irrelevant)
20 + *  fputendian(fp)      write native endianness in BigEndian= line
21   *  getheader(fp,f,p)   read header from fp, calling f(s,p) on each line
22   *  globmatch(pat, str) check for glob match of str against pat
23   *  checkheader(i,p,o)  check header format from i against p and copy to o
# Line 26 | Line 29 | static const char      RCSid[] = "$Id$";
29  
30   #include  <ctype.h>
31  
32 + #include  "tiff.h"      /* for int32 */
33   #include  "rtio.h"
34   #include  "resolu.h"
35  
# Line 40 | Line 44 | const char  FMTSTR[] = "FORMAT=";      /* format identifier
44   const char  TMSTR[] = "CAPDATE=";       /* capture date identifier */
45   const char  GMTSTR[] = "GMT=";          /* GMT identifier */
46  
47 + const char  BIGEND[] = "BigEndian=";    /* big-endian variable */
48 +
49   static gethfunc mycheck;
50  
51  
# Line 51 | Line 57 | newheader(             /* identifying line of information header
57   {
58          fputs(HDRSTR, fp);
59          fputs(s, fp);
60 <        putc('\n', fp);
60 >        fputc('\n', fp);
61   }
62  
63  
# Line 161 | Line 167 | printargs(             /* print arguments to a file */
167          FILE  *fp
168   )
169   {
170 + #if defined(_WIN32) || defined(_WIN64)
171 +        extern char     *fixargv0(char *arg0);
172 +        char            myav0[128];
173 +                                /* clean up Windows executable path */
174 +        if (ac-- <= 0) return;
175 +        fputs(fixargv0(strcpy(myav0, *av++)), fp);
176 +        fputc(ac ? ' ' : '\n', fp);
177 + #endif
178          while (ac-- > 0) {
179                  fputword(*av++, fp);
180                  fputc(ac ? ' ' : '\n', fp);
# Line 195 | Line 209 | fputformat(            /* put out a format value */
209          FILE  *fp
210   )
211   {
212 +        int     align = 0;
213 +
214          fputs(FMTSTR, fp);
215          fputs(s, fp);
216 <        putc('\n', fp);
216 >                        /* pad to align binary type for mmap() */
217 >        if (!strcmp(s, "float"))
218 >                align = 4;
219 >        else if (!strcmp(s, "double"))
220 >                align = 8;
221 >        if (align) {
222 >                long    pos = ftell(fp);
223 >                if (pos >= 0) {
224 >                        pos = (pos + 2) % align;
225 >                        if (pos) align -= pos;
226 >                        else align = 0;
227 >                } else
228 >                        align = 0;
229 >        }
230 >        while (align-- > 0)
231 >                putc(' ', fp);
232 >        fputc('\n', fp);
233   }
234  
235  
236   int
237 + nativebigendian()       /* are we native on a big-endian machine? */
238 + {
239 +        union { int32 i; char c[4]; } u;
240 +
241 +        u.i = 1;
242 +
243 +        return(u.c[0] == 0);
244 + }
245 +
246 +
247 + int
248 + isbigendian(            /* header line says "BigEndian=1" (-1 if irrelevant) */
249 +        const char *s
250 + )
251 + {
252 +        const char      *be = BIGEND;
253 +
254 +        while ((*s != '\0') & (*be != '=') && *s++ == *be)
255 +                ++be;
256 +        if (*be != '=')
257 +                return(-1);     /* irrelevant */
258 +        while (isspace(*s))
259 +                s++;
260 +        if (*s++ != '=')
261 +                return(-1);
262 +        while (isspace(*s))
263 +                s++;
264 +        return(*s == '1');
265 + }
266 +
267 +
268 + void
269 + fputendian(             /* write native endianness in BigEndian= line */
270 +        FILE *fp
271 + )
272 + {
273 +        fputs(BIGEND, fp);
274 +        if (nativebigendian())
275 +                fputs("1\n", fp);
276 +        else
277 +                fputs("0\n", fp);
278 + }
279 +
280 +
281 + int
282   getheader(              /* get header from file */
283          FILE  *fp,
284          gethfunc *f,
# Line 248 | Line 325 | mycheck(                       /* check a header line for format info. */
325          struct check    *scp = (struct check *)cp;
326  
327          if (!formatval(scp->fs, s) && scp->fp != NULL)
328 <                fputs(s, scp->fp);
328 >                return(fputs(s, scp->fp));
329  
330          return(0);
331   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines