ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.6 by greg, Fri Jun 27 06:53:21 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 <stdio.h>
23                          /* flags for scanline ordering */
24   #define  XDECR                  1
25   #define  YDECR                  2
# Line 52 | 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 – #ifdef NOPROTO
55                                          /* 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 */
56   extern void     fputresolu(int ord, int sl, int ns, FILE *fp);
57   extern int      fgetresolu(int *sl, int *ns, FILE *fp);
58   extern char *   resolu2str(char *buf, RESOLU *rp);
# Line 96 | Line 73 | extern int     getheader(FILE *fp, int (*f)(), char *p);
73   extern int      globmatch(char *pat, char *str);
74   extern int      checkheader(FILE *fin, char *fmt, FILE *fout);
75  
99 – #endif
100 –
76   #ifdef __cplusplus
77   }
78   #endif
79 + #endif /* _RAD_RESOLU_H_ */
80 +

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)