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.4 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 2.5 by schorsch, Fri Jun 6 16:38:47 2003 UTC

# Line 13 | 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 <
17 < #include "copyright.h"
18 <
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 52 | 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  
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 */
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);
# Line 96 | Line 74 | 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  
99 #endif
77  
78   #ifdef __cplusplus
79   }
80   #endif
81 + #endif /* _RAD_RESOLU_H_ */
82 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines