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.2 by greg, Fri Jun 4 17:01:29 1993 UTC vs.
Revision 2.4 by greg, Tue Feb 25 02:47:22 2003 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1991 Regents of the University of California */
2 <
3 < /* SCCSid "$SunId$ LBL" */
4 <
1 > /* RCSid $Id$ */
2   /*
3   * Definitions for resolution line in image file.
4   *
5 + * Include after <stdio.h>, <string.h>, and <time.h>
6 + *
7   * True image orientation is defined by an xy coordinate system
8   * whose origin is at the lower left corner of the image, with
9   * x increasing to the right and y increasing in the upward direction.
# Line 15 | Line 14
14   * indicating that the scanlines are in English text order (PIXSTANDARD).
15   */
16  
17 + #include "copyright.h"
18 +
19 + #ifdef __cplusplus
20 + extern "C" {
21 + #endif
22 +
23                          /* flags for scanline ordering */
24   #define  XDECR                  1
25   #define  YDECR                  2
# Line 26 | Line 31
31  
32                          /* structure for image dimensions */
33   typedef struct {
34 <        int     or;             /* orientation (from flags above) */
34 >        int     rt;             /* orientation (from flags above) */
35          int     xr, yr;         /* x and y resolution */
36   } RESOLU;
37  
38                          /* macros to get scanline length and number */
39 < #define  scanlen(rs)            ((rs)->or & YMAJOR ? (rs)->xr : (rs)->yr)
40 < #define  numscans(rs)           ((rs)->or & YMAJOR ? (rs)->yr : (rs)->xr)
39 > #define  scanlen(rs)            ((rs)->rt & YMAJOR ? (rs)->xr : (rs)->yr)
40 > #define  numscans(rs)           ((rs)->rt & YMAJOR ? (rs)->yr : (rs)->xr)
41  
42                          /* resolution string buffer and its size */
43   #define  RESOLU_BUFLEN          32
# Line 47 | Line 52 | extern char  resolu_buf[RESOLU_BUFLEN];
52   #define  fprtresolu(sl,ns,fp)   fprintf(fp,PIXSTDFMT,ns,sl)
53   #define  fscnresolu(sl,ns,fp)   (fscanf(fp,PIXSTDFMT,ns,sl)==2)
54  
55 < extern char  *resolu2str();
55 > #ifdef NOPROTO
56 >                                        /* defined in resolu.c */
57 > extern void     fputresolu();
58 > extern int      fgetresolu();
59 > extern char     *resolu2str();
60 > extern int      str2resolu();
61 >                                        /* defined in header.c */
62 > extern void     newheader();
63 > extern int      isheadid();
64 > extern int      headidval();
65 > extern int      dateval();
66 > extern int      isdate();
67 > extern void     fputdate();
68 > extern void     fputnow();
69 > extern void     printargs();
70 > extern int      isformat();
71 > extern int      formatval();
72 > extern void     fputformat();
73 > extern int      getheader();
74 > extern int      globmatch();
75 > extern int      checkheader();
76 >
77 > #else
78 >                                        /* defined in resolu.c */
79 > extern void     fputresolu(int ord, int sl, int ns, FILE *fp);
80 > extern int      fgetresolu(int *sl, int *ns, FILE *fp);
81 > extern char *   resolu2str(char *buf, RESOLU *rp);
82 > extern int      str2resolu(RESOLU *rp, char *buf);
83 >                                        /* defined in header.c */
84 > extern void     newheader(char *t, FILE *fp);
85 > extern int      isheadid(char *s);
86 > extern int      headidval(char *r, char *s);
87 > extern int      dateval(time_t *t, char *s);
88 > extern int      isdate(char *s);
89 > extern void     fputdate(time_t t, FILE *fp);
90 > extern void     fputnow(FILE *fp);
91 > extern void     printargs(int ac, char **av, FILE *fp);
92 > extern int      isformat(char *s);
93 > extern int      formatval(char *r, char *s);
94 > extern void     fputformat(char *s, FILE *fp);
95 > extern int      getheader(FILE *fp, int (*f)(), char *p);
96 > extern int      globmatch(char *pat, char *str);
97 > extern int      checkheader(FILE *fin, char *fmt, FILE *fout);
98 >
99 > #endif
100 >
101 > #ifdef __cplusplus
102 > }
103 > #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines