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.34 by greg, Sun Jun 9 18:22:20 2019 UTC vs.
Revision 2.42 by greg, Thu Mar 3 15:43:04 2022 UTC

# Line 4 | Line 4 | static const char      RCSid[] = "$Id$";
4   /*
5   *  header.c - routines for reading and writing information headers.
6   *
7 < *  Externals declared in resolu.h
7 > *  Externals declared in rtio.h
8   *
9   *  newheader(t,fp)     start new information header identified by string t
10   *  headidval(r,s)      copy header identifier value in s to r
# 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 (!strncmp(s, "16-bit", 6))
218 >                align = 2;
219 >        else if (!strcmp(s, "float") || !strncmp(s, "32-bit", 6))
220 >                align = 4;
221 >        else if (!strcmp(s, "double") || !strncmp(s, "64-bit", 6))
222 >                align = 8;
223 >        if (align) {
224 >                long    pos = ftell(fp);
225 >                if (pos >= 0) {
226 >                        pos = (pos + 2) % align;
227 >                        if (pos) align -= pos;
228 >                        else align = 0;
229 >                } else
230 >                        align = 0;
231 >        }
232 >        while (align-- > 0)
233 >                putc(' ', fp);
234 >        fputc('\n', fp);
235   }
236  
237  
238   int
239 + nativebigendian()       /* are we native on a big-endian machine? */
240 + {
241 +        union { int32 i; char c[4]; } u;
242 +
243 +        u.i = 1;
244 +
245 +        return(u.c[0] == 0);
246 + }
247 +
248 +
249 + int
250 + isbigendian(            /* header line says "BigEndian=1" (-1 if irrelevant) */
251 +        const char *s
252 + )
253 + {
254 +        const char      *be = BIGEND;
255 +
256 +        while ((*s != '\0') & (*be != '=') && *s++ == *be)
257 +                ++be;
258 +        if (*be != '=')
259 +                return(-1);     /* irrelevant */
260 +        while (isspace(*s))
261 +                s++;
262 +        if (*s++ != '=')
263 +                return(-1);
264 +        while (isspace(*s))
265 +                s++;
266 +        return(*s == '1');
267 + }
268 +
269 +
270 + void
271 + fputendian(             /* write native endianness in BigEndian= line */
272 +        FILE *fp
273 + )
274 + {
275 +        fputs(BIGEND, fp);
276 +        if (nativebigendian())
277 +                fputs("1\n", fp);
278 +        else
279 +                fputs("0\n", fp);
280 + }
281 +
282 +
283 + int
284   getheader(              /* get header from file */
285          FILE  *fp,
286          gethfunc *f,
# Line 248 | Line 327 | mycheck(                       /* check a header line for format info. */
327          struct check    *scp = (struct check *)cp;
328  
329          if (!formatval(scp->fs, s) && scp->fp != NULL)
330 <                fputs(s, scp->fp);
330 >                return(fputs(s, scp->fp));
331  
332          return(0);
333   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines