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

Comparing ray/src/cv/mgflib/parser.h (file contents):
Revision 1.8 by greg, Sat Jun 25 11:55:42 1994 UTC vs.
Revision 1.38 by greg, Mon Jan 3 20:30:21 2011 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1994 Regents of the University of California */
2 <
3 < /* SCCSid "$SunId$ LBL" */
4 <
1 > /* RCSid: $Id$ */
2   /*
3   * Header file for MGF interpreter
4   */
5 + #ifndef _MGF_PARSER_H_
6 + #define _MGF_PARSER_H_
7 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
11 < /* must include stdio.h before us */
11 > /* must include stdio.h and stdlib.h before us */
12  
13 <                        /* Entities (order doesn't really matter) */
12 < #define MG_E_COMMENT    0
13 < #define MG_E_COLOR      1
14 < #define MG_E_CONE       2
15 < #define MG_E_CMIX       3
16 < #define MG_E_CSPEC      4
17 < #define MG_E_CXY        5
18 < #define MG_E_CYL        6
19 < #define MG_E_ED         7
20 < #define MG_E_FACE       8
21 < #define MG_E_INCLUDE    9
22 < #define MG_E_IES        10
23 < #define MG_E_MATERIAL   11
24 < #define MG_E_NORMAL     12
25 < #define MG_E_OBJECT     13
26 < #define MG_E_POINT      14
27 < #define MG_E_PRISM      15
28 < #define MG_E_RD         16
29 < #define MG_E_RING       17
30 < #define MG_E_RS         18
31 < #define MG_E_SPH        19
32 < #define MG_E_TD         20
33 < #define MG_E_TORUS      21
34 < #define MG_E_TS         22
35 < #define MG_E_VERTEX     23
36 < #define MG_E_XF         24
13 > #include "ccolor.h"
14  
15 < #define MG_NENTITIES    25
15 > #define MG_VMAJOR       2               /* major version number */
16 > #define MG_VMINOR       0               /* minor version number */
17  
18 < #define MG_NAMELIST     {"#","c","cone","cmix","cspec","cxy","cyl","ed","f",\
19 <                        "i","ies","m","n","o","p","prism","rd","ring","rs",\
20 <                        "sph","td","torus","ts","v","xf"}
18 >                        /* Entities (list is only appended, never modified) */
19 > #define MG_E_COMMENT    0               /* #            */
20 > #define MG_E_COLOR      1               /* c            */
21 > #define MG_E_CCT        2               /* cct          */
22 > #define MG_E_CONE       3               /* cone         */
23 > #define MG_E_CMIX       4               /* cmix         */
24 > #define MG_E_CSPEC      5               /* cspec        */
25 > #define MG_E_CXY        6               /* cxy          */
26 > #define MG_E_CYL        7               /* cyl          */
27 > #define MG_E_ED         8               /* ed           */
28 > #define MG_E_FACE       9               /* f            */
29 > #define MG_E_INCLUDE    10              /* i            */
30 > #define MG_E_IES        11              /* ies          */
31 > #define MG_E_IR         12              /* ir           */
32 > #define MG_E_MATERIAL   13              /* m            */
33 > #define MG_E_NORMAL     14              /* n            */
34 > #define MG_E_OBJECT     15              /* o            */
35 > #define MG_E_POINT      16              /* p            */
36 > #define MG_E_PRISM      17              /* prism        */
37 > #define MG_E_RD         18              /* rd           */
38 > #define MG_E_RING       19              /* ring         */
39 > #define MG_E_RS         20              /* rs           */
40 > #define MG_E_SIDES      21              /* sides        */
41 > #define MG_E_SPH        22              /* sph          */
42 > #define MG_E_TD         23              /* td           */
43 > #define MG_E_TORUS      24              /* torus        */
44 > #define MG_E_TS         25              /* ts           */
45 > #define MG_E_VERTEX     26              /* v            */
46 > #define MG_E_XF         27              /* xf           */
47 >                        /* end of Version 1 entities */
48 > #define MG_E_FACEH      28              /* fh           */
49 >                        /* end of Version 2 entities */
50  
51 + #define MG_NENTITIES    29              /* total # entities */
52 +
53 + #define MG_NELIST       {28,29}         /* entity count for version 1 and up */
54 +
55 + #define MG_NAMELIST     {"#","c","cct","cone","cmix","cspec","cxy","cyl","ed",\
56 +                        "f","i","ies","ir","m","n","o","p","prism","rd",\
57 +                        "ring","rs","sides","sph","td","torus","ts","v","xf",\
58 +                        "fh"}
59 +
60   #define MG_MAXELEN      6
61  
62   extern char     mg_ename[MG_NENTITIES][MG_MAXELEN];
63  
64 <                        /* Handler routines for each entity */
49 <
50 < #ifdef NOPROTO
51 < extern int      (*mg_ehand[MG_NENTITIES])();
52 < #else
64 >                        /* Handler routines for each entity and unknown ones */
65   extern int      (*mg_ehand[MG_NENTITIES])(int argc, char **argv);
66 < #endif
66 > extern int      (*mg_uhand)(int argc, char **argv);
67 > extern int      mg_defuhand(int, char **);
68  
69 + extern unsigned mg_nunknown;            /* count of unknown entities */
70 +
71                          /* Error codes */
72   #define MG_OK           0               /* normal return value */
73   #define MG_EUNK         1               /* unknown entity */
# Line 65 | Line 80 | extern int     (*mg_ehand[MG_NENTITIES])(int argc, char **
80   #define MG_EMEM         8               /* out of memory */
81   #define MG_ESEEK        9               /* file seek error */
82   #define MG_EBADMAT      10              /* bad material specification */
83 + #define MG_ELINE        11              /* input line too long */
84 + #define MG_ECNTXT       12              /* unmatched context close */
85  
86 < #define MG_NERRS        11
86 > #define MG_NERRS        13
87  
88 < extern char     *mg_err[MG_NERRS];
88 > extern char     *mg_err[MG_NERRS];      /* list of error messages */
89  
90   /*
91   * The general process for running the parser is to fill in the mg_ehand
# Line 79 | Line 96 | extern char    *mg_err[MG_NERRS];
96   * To read from standard input, use NULL as the file name.
97   * For additional control over error reporting and file management,
98   * use mg_open, mg_read, mg_parse and mg_close instead of mg_load.
99 + * To pass an entity of your own construction to the parser, use
100 + * the mg_handle function rather than the mg_ehand routines directly.
101 + * (The first argument to mg_handle is the entity #, or -1.)
102   * To free any data structures and clear the parser, use mg_clear.
103 < * If there is an error, mg_load, mg_open, mg_parse, and mg_rewind
104 < * will return an error from the list above.  In addition, mg_load
105 < * will report the error to stderr.  The mg_read routine returns 0
106 < * when the end of file has been reached.
103 > * If there is an error, mg_load, mg_open, mg_parse, mg_handle and
104 > * mg_fgoto will return an error from the list above.  In addition,
105 > * mg_load will report the error to stderr.  The mg_read routine
106 > * returns 0 when the end of file has been reached.
107   */
108  
109 < #define MG_MAXLINE      512             /* maximum input line length */
109 > #define MG_MAXLINE      4096            /* maximum input line length */
110   #define MG_MAXARGC      (MG_MAXLINE/4)  /* maximum argument count */
111  
112   typedef struct mg_fctxt {
113          char    fname[96];                      /* file name */
114          FILE    *fp;                            /* stream pointer */
115 +        int     fid;                            /* unique file context id */
116          char    inpline[MG_MAXLINE];            /* input line */
117          int     lineno;                         /* line number */
118          struct mg_fctxt *prev;                  /* previous context */
119   } MG_FCTXT;
120  
121 + typedef struct {
122 +        int     fid;                            /* file this position is for */
123 +        int     lineno;                         /* line number in file */
124 +        long    offset;                         /* offset from beginning */
125 + } MG_FPOS;
126 +
127   extern MG_FCTXT *mg_file;               /* current file context */
128  
102 – #ifdef NOPROTO
103 – extern void     mg_init();              /* fill in mg_ehand array */
104 – extern int      mg_load();              /* parse a file */
105 – extern int      mg_open();              /* open new input file */
106 – extern int      mg_read();              /* read next line */
107 – extern int      mg_parse();             /* parse current line */
108 – extern int      mg_rewind();            /* rewind input file */
109 – extern void     mg_close();             /* close input file */
110 – extern void     mg_clear();             /* clear parser */
111 – extern int      mg_iterate();
112 – #else
129   extern void     mg_init(void);          /* fill in mg_ehand array */
130   extern int      mg_load(char *);        /* parse a file */
131   extern int      mg_open(MG_FCTXT *, char *);    /* open new input file */
132   extern int      mg_read(void);          /* read next line */
133   extern int      mg_parse(void);         /* parse current line */
134 < extern int      mg_rewind(void);        /* rewind input file */
134 > extern void     mg_fgetpos(MG_FPOS *);  /* get position on input file */
135 > extern int      mg_fgoto(MG_FPOS *);    /* go to position on input file */
136   extern void     mg_close(void);         /* close input file */
137   extern void     mg_clear(void);         /* clear parser */
138 < extern int      mg_iterate(int, char **, int (*)(void));
122 < #endif
138 > extern int      mg_handle(int, int, char **);   /* handle an entity */
139  
140   #ifndef MG_NQCD
141   #define MG_NQCD         5               /* default number of divisions */
# Line 131 | Line 147 | extern int     mg_nqcdivs;             /* divisions per quarter circl
147   * The following library routines are included for your convenience:
148   */
149  
134 – #ifdef NOPROTO
135 – extern int mg_entity();                 /* get entity number from its name */
136 – extern int isint();                     /* non-zero if integer format */
137 – extern int isflt();                     /* non-zero if floating point format */
138 – #else
150   extern int mg_entity(char *);           /* get entity number from its name */
151   extern int isint(char *);               /* non-zero if integer format */
152 + extern int isintd(char *, char *);      /* same with delimiter set */
153   extern int isflt(char *);               /* non-zero if floating point format */
154 < #endif
154 > extern int isfltd(char *, char *);      /* same with delimiter set */
155 > extern int isname(char *);              /* non-zero if legal identifier name */
156 > extern int badarg(int, char **, char *);/* check argument format */
157 > extern int e_include(int, char **);     /* expand include entity */
158 > extern int e_pipe(int, char **);        /* expand piped command */
159 > extern int e_sph(int, char **);         /* expand sphere as other entities */
160 > extern int e_torus(int, char **);       /* expand torus as other entities */
161 > extern int e_cyl(int, char **);         /* expand cylinder as other entities */
162 > extern int e_ring(int, char **);        /* expand ring as other entities */
163 > extern int e_cone(int, char **);        /* expand cone as other entities */
164 > extern int e_prism(int, char **);       /* expand prism as other entities */
165 > extern int e_faceh(int, char **);       /* expand face w/ holes as face */
166  
167   /************************************************************************
168   *      Definitions for 3-d vector manipulation functions
169   */
170  
171   #ifdef  SMLFLT
172 < #define  FLOAT          float
172 > #define  RREAL          float
173   #define  FTINY          (1e-3)
174   #else
175 < #define  FLOAT          double
175 > #define  RREAL          double
176   #define  FTINY          (1e-6)
177   #endif
178   #define  FHUGE          (1e10)
179  
180 < typedef FLOAT  FVECT[3];
180 > typedef RREAL  FVECT[3];
181  
182   #define  VCOPY(v1,v2)   ((v1)[0]=(v2)[0],(v1)[1]=(v2)[1],(v1)[2]=(v2)[2])
183   #define  DOT(v1,v2)     ((v1)[0]*(v2)[0]+(v1)[1]*(v2)[1]+(v1)[2]*(v2)[2])
# Line 166 | Line 189 | typedef FLOAT  FVECT[3];
189  
190   #define round0(x)       if (x <= FTINY && x >= -FTINY) x = 0
191  
169 – #ifdef NOPROTO
170 – extern double   normalize();            /* normalize a vector */
171 – #else
192   extern double   normalize(FVECT);       /* normalize a vector */
193 < #endif
193 > extern void     fcross(FVECT,FVECT,FVECT);/* cross product of two vectors */
194  
195   /************************************************************************
196   *      Definitions for context handling routines
197   *      (materials, colors, vectors)
198   */
199  
200 < #define C_CMINWL        380             /* minimum wavelength */
181 < #define C_CMAXWL        780             /* maximum wavelength */
182 < #define C_CNSS          41              /* number of spectral samples */
183 < #define C_CWLI          ((C_CMAXWL-C_CMINWL)/(C_CNSS-1))
184 < #define C_CMAXV         10000           /* nominal maximum sample value */
200 > #define C_1SIDEDTHICK   0.005           /* assumed thickness of 1-sided mat. */
201  
186 – #define C_CSSPEC        01              /* flag if spectrum is set */
187 – #define C_CDSPEC        02              /* flag if defined w/ spectrum */
188 – #define C_CSXY          04              /* flag if xy is set */
189 – #define C_CDXY          010             /* flag if defined w/ xy */
190 –
202   typedef struct {
192 –        char    *name;                  /* material name */
193 –        int     clock;                  /* incremented each change */
194 –        short   flags;                  /* what's been set */
195 –        short   ssamp[C_CNSS];          /* spectral samples, min wl to max */
196 –        long    ssum;                   /* straight sum of spectral values */
197 –        float   cx, cy;                 /* xy chromaticity value */
198 – } C_COLOR;
199 –
200 – #define C_DEFCOLOR      { NULL, 1, C_CDXY|C_CSXY|C_CSSPEC,\
201 –                        {C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
202 –                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
203 –                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
204 –                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
205 –                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
206 –                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,\
207 –                        C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV,C_CMAXV},\
208 –                        (long)C_CNSS*C_CMAXV, 1./3., 1./3. }
209 –
210 – #define C_CIEX          { "_cie_x", 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
211 –                        {14,42,143,435,1344,2839,3483,3362,2908,1954,956,\
212 –                        320,49,93,633,1655,2904,4334,5945,7621,9163,10263,\
213 –                        10622,10026,8544,6424,4479,2835,1649,874,468,227,\
214 –                        114,58,29,14,7,3,2,1,0}, 106836L, .735, .265 }
215 –
216 – #define C_CIEY          { "_cie_y", 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
217 –                        {0,1,4,12,40,116,230,380,600,910,1390,2080,3230,\
218 –                        5030,7100,8620,9540,9950,9950,9520,8700,7570,6310,\
219 –                        5030,3810,2650,1750,1070,610,320,170,82,41,21,10,\
220 –                        5,2,1,1,0,0}, 106856L, .274, .717 }
221 –
222 – #define C_CIEZ          { "_cie_z", 1, C_CDSPEC|C_CSSPEC|C_CSXY,\
223 –                        {65,201,679,2074,6456,13856,17471,17721,16692,\
224 –                        12876,8130,4652,2720,1582,782,422,203,87,39,21,17,\
225 –                        11,8,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},\
226 –                        106770L, .167, .009 }
227 –
228 – #define c_cval(c,l)     ((double)(c)->ssamp[((l)-C_MINWL)/C_CWLI] / (c)->sum)
229 –
230 – typedef struct {
231 –        char    *name;          /* material name */
203          int     clock;          /* incremented each change -- resettable */
204 +        char    *client_data;   /* pointer to private client-owned data */
205 +        int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
206 +        float   nr, ni;         /* index of refraction, real and imaginary */
207          float   rd;             /* diffuse reflectance */
208          C_COLOR rd_c;           /* diffuse reflectance color */
209          float   td;             /* diffuse transmittance */
# Line 245 | Line 219 | typedef struct {
219   } C_MATERIAL;           /* material context */
220  
221   typedef struct {
248 –        char    *name;          /* vector name */
222          int     clock;          /* incremented each change -- resettable */
223 +        char    *client_data;   /* pointer to private client-owned data */
224          FVECT   p, n;           /* point and normal */
225   } C_VERTEX;             /* vertex context */
226  
227 < #define C_DEFMATERIAL   {NULL,1,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,C_DEFCOLOR,\
228 <                                        0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
229 < #define C_DEFVERTEX     {NULL,1,{0.,0.,0.},{0.,0.,0.}}
227 > #define C_DEFMATERIAL   {1,NULL,0,1.,0.,0.,C_DEFCOLOR,0.,C_DEFCOLOR,0.,\
228 >                                C_DEFCOLOR,0.,C_DEFCOLOR,0.,0.,C_DEFCOLOR,0.}
229 > #define C_DEFVERTEX     {1,NULL,{0.,0.,0.},{0.,0.,0.}}
230  
231   extern C_COLOR          *c_ccolor;      /* the current color */
232 + extern char             *c_ccname;      /* current color name */
233   extern C_MATERIAL       *c_cmaterial;   /* the current material */
234 + extern char             *c_cmname;      /* current material name */
235   extern C_VERTEX         *c_cvertex;     /* the current vertex */
236 + extern char             *c_cvname;      /* current vertex name */
237  
261 – #ifdef NOPROTO
262 – extern int      c_hcolor();                     /* handle color entity */
263 – extern int      c_hmaterial();                  /* handle material entity */
264 – extern int      c_hvertex();                    /* handle vertex entity */
265 – extern void     c_clearall();                   /* clear context tables */
266 – extern C_VERTEX *c_getvert();                   /* get a named vertex */
267 – extern C_COLOR  *c_getcolor();                  /* get a named color */
268 – extern void     c_ccvt();                       /* fix color representation */
269 – extern int      c_isgrey();                     /* check if color is grey */
270 – #else
238   extern int      c_hcolor(int, char **);         /* handle color entity */
239   extern int      c_hmaterial(int, char **);      /* handle material entity */
240   extern int      c_hvertex(int, char **);        /* handle vertex entity */
241   extern void     c_clearall(void);               /* clear context tables */
242 + extern C_MATERIAL       *c_getmaterial(char *); /* get a named material */
243   extern C_VERTEX *c_getvert(char *);             /* get a named vertex */
244   extern C_COLOR  *c_getcolor(char *);            /* get a named color */
277 – extern void     c_ccvt(C_COLOR *, int);         /* fix color representation */
278 – extern int      c_isgrey(C_COLOR *);            /* check if color is grey */
279 – #endif
245  
246   /*************************************************************************
247   *      Definitions for hierarchical object name handler
# Line 285 | Line 250 | extern int     c_isgrey(C_COLOR *);            /* check if color is
250   extern int      obj_nnames;             /* depth of name hierarchy */
251   extern char     **obj_name;             /* names in hierarchy */
252  
288 – #ifdef NOPROTO
289 – extern int      obj_handler();                  /* handle an object entity */
290 – extern void     obj_clear();                    /* clear object stack */
291 – #else
253   extern int      obj_handler(int, char **);      /* handle an object entity */
254   extern void     obj_clear(void);                /* clear object stack */
294 – #endif
255  
256   /**************************************************************************
257   *      Definitions for hierarchical transformation handler
258   */
259  
260 < typedef FLOAT  MAT4[4][4];
260 > typedef RREAL  MAT4[4][4];
261  
302 – #ifdef  BSD
303 – #define  copymat4(m4a,m4b)      bcopy((char *)m4b,(char *)m4a,sizeof(MAT4))
304 – #else
262   #define  copymat4(m4a,m4b)      (void)memcpy((char *)m4a,(char *)m4b,sizeof(MAT4))
306 – #endif
263  
264   #define  MAT4IDENT              { {1.,0.,0.,0.}, {0.,1.,0.,0.}, \
265                                  {0.,0.,1.,0.}, {0.,0.,0.,1.} }
# Line 314 | Line 270 | extern MAT4  m4ident;
270  
271                                  /* regular transformation */
272   typedef struct {
273 <        MAT4  xfm;                              /* transform matrix */
274 <        FLOAT  sca;                             /* scalefactor */
273 >        MAT4    xfm;                            /* transform matrix */
274 >        RREAL   sca;                            /* scalefactor */
275   }  XF;
276  
277   #define identxf(xp)             (void)(setident4((xp)->xfm),(xp)->sca=1.0)
278  
279 + #define XF_MAXDIM       8               /* maximum array dimensions */
280 +
281 + struct xf_array {
282 +        MG_FPOS spos;                   /* starting position on input */
283 +        int     ndim;                   /* number of array dimensions */
284 +        struct {
285 +                short   i, n;           /* current count and maximum */
286 +                char    arg[8];         /* string argument value */
287 +        } aarg[XF_MAXDIM];
288 + };
289 +
290   typedef struct xf_spec {
291 <        short   xac;            /* transform argument count */
292 <        short   xav0;           /* zeroeth argument in xf_argv array */
293 <        XF      xf;             /* cumulative transformation */
294 <        struct xf_spec  *prev;  /* previous transformation context */
295 < } XF_SPEC;
291 >        long    xid;                    /* unique transform id */
292 >        short   xac;                    /* context argument count */
293 >        short   rev;                    /* boolean true if vertices reversed */
294 >        XF      xf;                     /* cumulative transformation */
295 >        struct xf_array *xarr;          /* transformation array pointer */
296 >        struct xf_spec  *prev;          /* previous transformation context */
297 > } XF_SPEC;                      /* followed by argument buffer */
298  
299 < extern int      xf_argc;                        /* total # transform args. */
300 < extern char     **xf_argv;                      /* transform arguments */
332 < extern XF_SPEC  *xf_context;                    /* current context */
299 > extern XF_SPEC  *xf_context;                    /* current transform context */
300 > extern char     **xf_argend;                    /* last transform argument */
301  
302 + #define xf_ac(xf)       ((xf)==NULL ? 0 : (xf)->xac)
303 + #define xf_av(xf)       (xf_argend - (xf)->xac)
304 +
305 + #define xf_argc         xf_ac(xf_context)
306 + #define xf_argv         xf_av(xf_context)
307 +
308   /*
309   * The transformation handler should do most of the work that needs
310   * doing.  Just pass it any xf entities, then use the associated
# Line 343 | Line 317 | extern XF_SPEC *xf_context;                    /* current context */
317   * puts the result into the first.
318   */
319  
346 – #ifdef NOPROTO
320  
348 – extern int      xf_handler();           /* handle xf entity */
349 – extern void     xf_xfmpoint();          /* transform point */
350 – extern void     xf_xfmvect();           /* transform vector */
351 – extern void     xf_rotvect();           /* rotate vector */
352 – extern double   xf_scale();             /* scale a value */
353 – extern void     xf_clear();             /* clear xf stack */
354 –
355 – /* The following are support routines you probably won't call directly */
356 –
357 – extern void     multmat4();             /* m4a = m4b X m4c */
358 – extern void     multv3();               /* v3a = v3b X m4 (vectors) */
359 – extern void     multp3();               /* p3a = p3b X m4 (points) */
360 – extern int      xf();                   /* interpret transform spec. */
361 –
362 – #else
363 –
321   extern int      xf_handler(int, char **);       /* handle xf entity */
322   extern void     xf_xfmpoint(FVECT, FVECT);      /* transform point */
323   extern void     xf_xfmvect(FVECT, FVECT);       /* transform vector */
# Line 370 | Line 327 | extern void    xf_clear(void);                 /* clear xf stack */
327  
328   /* The following are support routines you probably won't call directly */
329  
330 + XF_SPEC         *new_xf(int, char **);          /* allocate new transform */
331 + void            free_xf(XF_SPEC *);             /* free a transform */
332 + int             xf_aname(struct xf_array *);    /* name this instance */
333 + long            comp_xfid(MAT4);                /* compute unique ID */
334   extern void     multmat4(MAT4, MAT4, MAT4);     /* m4a = m4b X m4c */
335   extern void     multv3(FVECT, FVECT, MAT4);     /* v3a = v3b X m4 (vectors) */
336   extern void     multp3(FVECT, FVECT, MAT4);     /* p3a = p3b X m4 (points) */
337   extern int      xf(XF *, int, char **);         /* interpret transform spec. */
338  
339 < #endif
339 >        /* cvrgb.c */
340 > extern void mgf2rgb(C_COLOR *cin, double intensity, float cout[3]);
341  
342 +
343   /************************************************************************
344   *      Miscellaneous definitions
345   */
346  
347 + #ifndef  PI
348   #ifdef  M_PI
349 < #define  PI             M_PI
349 > #define  PI             ((double)M_PI)
350   #else
351   #define  PI             3.14159265358979323846
352   #endif
389 –
390 – #ifdef DCL_ATOF
391 – extern double   atof();
353   #endif
354  
355   #ifndef MEM_PTR
356   #define MEM_PTR         void *
357   #endif
358  
359 < extern MEM_PTR  malloc();
360 < extern MEM_PTR  calloc();
361 < extern MEM_PTR  realloc();
362 < extern void     free();
359 > #ifdef __cplusplus
360 > }
361 > #endif
362 > #endif /* _MGF_PARSER_H_ */
363 >

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines