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 1.1 by greg, Mon Nov 11 14:03:22 1991 UTC vs.
Revision 2.5 by schorsch, Fri Jun 6 16:38:47 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 14 | Line 13
13   * A typical line for a 1024x600 image might be "-Y 600 +X 1024\n",
14   * indicating that the scanlines are in English text order (PIXSTANDARD).
15   */
16 + #ifndef _RAD_RESOLU_H_
17 + #define _RAD_RESOLU_H_
18 + #ifdef __cplusplus
19 + extern "C" {
20 + #endif
21  
22 + #include "copyright.h"
23 +
24                          /* flags for scanline ordering */
25   #define  XDECR                  1
26   #define  YDECR                  2
# Line 26 | Line 32
32  
33                          /* structure for image dimensions */
34   typedef struct {
35 <        int     or;             /* orientation (from flags above) */
35 >        int     rt;             /* orientation (from flags above) */
36          int     xr, yr;         /* x and y resolution */
37   } RESOLU;
38  
39                          /* macros to get scanline length and number */
40 < #define  scanlen(rs)            ((rs)->or & YMAJOR ? (rs)->xr : (rs)->yr)
41 < #define  numscans(rs)           ((rs)->or & YMAJOR ? (rs)->yr : (rs)->xr)
40 > #define  scanlen(rs)            ((rs)->rt & YMAJOR ? (rs)->xr : (rs)->yr)
41 > #define  numscans(rs)           ((rs)->rt & YMAJOR ? (rs)->yr : (rs)->xr)
42  
43                          /* resolution string buffer and its size */
44   #define  RESOLU_BUFLEN          32
# Line 47 | Line 53 | extern char  resolu_buf[RESOLU_BUFLEN];
53   #define  fprtresolu(sl,ns,fp)   fprintf(fp,PIXSTDFMT,ns,sl)
54   #define  fscnresolu(sl,ns,fp)   (fscanf(fp,PIXSTDFMT,ns,sl)==2)
55  
56 < extern char  *fgets(), *resolu2str();
56 >                                        /* defined in resolu.c */
57 > extern void     fputresolu(int ord, int sl, int ns, FILE *fp);
58 > extern int      fgetresolu(int *sl, int *ns, FILE *fp);
59 > extern char *   resolu2str(char *buf, RESOLU *rp);
60 > extern int      str2resolu(RESOLU *rp, char *buf);
61 >                                        /* defined in header.c */
62 > extern void     newheader(char *t, FILE *fp);
63 > extern int      isheadid(char *s);
64 > extern int      headidval(char *r, char *s);
65 > extern int      dateval(time_t *t, char *s);
66 > extern int      isdate(char *s);
67 > extern void     fputdate(time_t t, FILE *fp);
68 > extern void     fputnow(FILE *fp);
69 > extern void     printargs(int ac, char **av, FILE *fp);
70 > extern int      isformat(char *s);
71 > extern int      formatval(char *r, char *s);
72 > extern void     fputformat(char *s, FILE *fp);
73 > extern int      getheader(FILE *fp, int (*f)(), char *p);
74 > extern int      globmatch(char *pat, char *str);
75 > extern int      checkheader(FILE *fin, char *fmt, FILE *fout);
76 >
77 >
78 > #ifdef __cplusplus
79 > }
80 > #endif
81 > #endif /* _RAD_RESOLU_H_ */
82 >

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines