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.38 by greg, Mon Jan 3 20:30:21 2011 UTC vs.
Revision 1.39 by greg, Fri Jan 14 05:46:12 2011 UTC

# Line 4 | Line 4
4   */
5   #ifndef _MGF_PARSER_H_
6   #define _MGF_PARSER_H_
7 – #ifdef __cplusplus
8 – extern "C" {
9 – #endif
7  
8   /* must include stdio.h and stdlib.h before us */
9  
10   #include "ccolor.h"
11  
12 + #ifdef __cplusplus
13 + extern "C" {
14 + #endif
15 +
16   #define MG_VMAJOR       2               /* major version number */
17   #define MG_VMINOR       0               /* minor version number */
18  
# Line 201 | Line 202 | extern void    fcross(FVECT,FVECT,FVECT);/* cross product
202  
203   typedef struct {
204          int     clock;          /* incremented each change -- resettable */
205 <        char    *client_data;   /* pointer to private client-owned data */
205 >        void    *client_data;   /* pointer to private client-owned data */
206          int     sided;          /* 1 if surface is 1-sided, 0 for 2-sided */
207          float   nr, ni;         /* index of refraction, real and imaginary */
208          float   rd;             /* diffuse reflectance */
# Line 220 | Line 221 | typedef struct {
221  
222   typedef struct {
223          int     clock;          /* incremented each change -- resettable */
224 <        char    *client_data;   /* pointer to private client-owned data */
224 >        void    *client_data;   /* pointer to private client-owned data */
225          FVECT   p, n;           /* point and normal */
226   } C_VERTEX;             /* vertex context */
227  
# Line 339 | Line 340 | extern int     xf(XF *, int, char **);         /* interpret trans
340          /* cvrgb.c */
341   extern void mgf2rgb(C_COLOR *cin, double intensity, float cout[3]);
342  
342 –
343   /************************************************************************
344   *      Miscellaneous definitions
345   */
# Line 350 | Line 350 | extern void mgf2rgb(C_COLOR *cin, double intensity, fl
350   #else
351   #define  PI             3.14159265358979323846
352   #endif
353 – #endif
354 –
355 – #ifndef MEM_PTR
356 – #define MEM_PTR         void *
353   #endif
354  
355   #ifdef __cplusplus

Diff Legend

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