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

Comparing ray/src/common/resolu.h (file contents):
Revision 2.10 by greg, Tue Feb 1 01:28:16 2005 UTC vs.
Revision 2.13 by greg, Thu Aug 2 18:33:42 2018 UTC

# Line 55 | Line 55 | extern char  resolu_buf[RESOLU_BUFLEN];
55   #define  fprtresolu(sl,ns,fp)   fprintf(fp,PIXSTDFMT,ns,sl)
56   #define  fscnresolu(sl,ns,fp)   (fscanf(fp,PIXSTDFMT,ns,sl)==2)
57  
58 +                        /* identify header lines */
59 + #define  MAXFMTLEN      64
60 + #define  isheadid(s)    headidval(NULL,s)
61 + #define  isformat(s)    formatval(NULL,s)
62 + #define  isdate(s)      dateval(NULL,s)
63 + #define  isgmt(s)       gmtval(NULL,s)
64 +
65 + #define  LATLONSTR      "LATLONG="
66 + #define  LLATLONSTR     8
67 + #define  islatlon(hl)           (!strncmp(hl,LATLONSTR,LLATLONSTR))
68 + #define  latlonval(ll,hl)       sscanf((hl)+LLATLONSTR, "%f %f", \
69 +                                                &(ll)[0],&(ll)[1])
70 + #define  fputlatlon(lat,lon,fp) fprintf(fp,"%s %.6f %.6f\n",LATLONSTR,lat,lon)
71 +
72                                          /* defined in resolu.c */
73   extern void     fputresolu(int ord, int sl, int ns, FILE *fp);
74   extern int      fgetresolu(int *sl, int *ns, FILE *fp);
75   extern char *   resolu2str(char *buf, RESOLU *rp);
76   extern int      str2resolu(RESOLU *rp, char *buf);
77                                          /* defined in header.c */
78 < extern void     newheader(char *t, FILE *fp);
79 < extern int      isheadid(char *s);
80 < extern int      headidval(char *r, char *s);
81 < extern int      dateval(time_t *t, char *s);
68 < extern int      isdate(char *s);
78 > extern void     newheader(const char *t, FILE *fp);
79 > extern int      headidval(char *r, const char *s);
80 > extern int      dateval(time_t *t, const char *s);
81 > extern int      gmtval(time_t *t, const char *s);
82   extern void     fputdate(time_t t, FILE *fp);
83   extern void     fputnow(FILE *fp);
84   extern void     printargs(int ac, char **av, FILE *fp);
85 < extern int      isformat(char *s);
86 < extern int      formatval(char *r, char *s);
74 < extern void     fputformat(char *s, FILE *fp);
85 > extern int      formatval(char fmt[MAXFMTLEN], const char *s);
86 > extern void     fputformat(const char *s, FILE *fp);
87   typedef int gethfunc(char *s, void *p); /* callback to process header lines */
88   extern int      getheader(FILE *fp, gethfunc *f, void *p);
89 < extern int      globmatch(char *pat, char *str);
90 < extern int      checkheader(FILE *fin, char *fmt, FILE *fout);
89 > extern int      globmatch(const char *pat, const char *str);
90 > extern int      checkheader(FILE *fin, char fmt[MAXFMTLEN], FILE *fout);
91  
92   #ifdef __cplusplus
93   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines