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

Comparing ray/src/common/font.h (file contents):
Revision 2.5 by greg, Tue Feb 25 02:47:21 2003 UTC vs.
Revision 2.9 by greg, Sat Nov 20 00:40:33 2021 UTC

# Line 2 | Line 2
2   /*
3   * Header file for font handling routines
4   */
5 + #ifndef _RAD_FONT_H_
6 + #define _RAD_FONT_H_
7  
8 < #include "copyright.h"
8 > #ifdef __cplusplus
9 > extern "C" {
10 > #endif
11  
12   typedef unsigned char  GORD;
13  
# Line 16 | Line 20 | typedef struct {
20   #define gvlist(g)       ((GORD *)((g)+1))
21  
22   typedef struct font {
23 +        char  name[64];                 /* font file name */
24 +        struct font  *next;             /* next font in list */
25          int  nref;                      /* number of references */
20        GLYPH  *fg[256];                /* font glyphs */
26          short  mwidth, mheight;         /* mean glyph width and height */
27 <        char  *name;                    /* font file name */
23 <        struct font  *next;             /* next font in list */
27 >        GLYPH  *fg[256];                /* font glyphs */
28   }  FONT;
29  
30   extern int      retainfonts;            /* retain loaded fonts? */
31  
28 #ifdef NOPROTO
29
30 extern FONT  *getfont();
31 extern void  freefont();
32 extern int  uniftext();
33 extern int  squeeztext();
34 extern int  proptext();
35
36 #else
37
32   extern FONT  *getfont(char *fname);
33   extern void  freefont(FONT *f);
34   extern int  uniftext(short *sp, char *tp, FONT *f);
35   extern int  squeeztext(short *sp, char *tp, FONT *f, int cis);
36   extern int  proptext(short *sp, char *tp, FONT *f, int cis, int nsi);
37  
38 + #ifdef __cplusplus
39 + }
40   #endif
41 + #endif /* _RAD_FONT_H_ */
42 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines