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

Comparing ray/src/common/font.c (file contents):
Revision 2.11 by greg, Fri Jun 30 16:06:40 1995 UTC vs.
Revision 2.12 by greg, Sat Feb 22 02:07:22 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1992 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Polygonal font handling routines
6   */
7  
8 + /* ====================================================================
9 + * The Radiance Software License, Version 1.0
10 + *
11 + * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 + * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 + *
14 + * Redistribution and use in source and binary forms, with or without
15 + * modification, are permitted provided that the following conditions
16 + * are met:
17 + *
18 + * 1. Redistributions of source code must retain the above copyright
19 + *         notice, this list of conditions and the following disclaimer.
20 + *
21 + * 2. Redistributions in binary form must reproduce the above copyright
22 + *       notice, this list of conditions and the following disclaimer in
23 + *       the documentation and/or other materials provided with the
24 + *       distribution.
25 + *
26 + * 3. The end-user documentation included with the redistribution,
27 + *           if any, must include the following acknowledgment:
28 + *             "This product includes Radiance software
29 + *                 (http://radsite.lbl.gov/)
30 + *                 developed by the Lawrence Berkeley National Laboratory
31 + *               (http://www.lbl.gov/)."
32 + *       Alternately, this acknowledgment may appear in the software itself,
33 + *       if and wherever such third-party acknowledgments normally appear.
34 + *
35 + * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 + *       and "The Regents of the University of California" must
37 + *       not be used to endorse or promote products derived from this
38 + *       software without prior written permission. For written
39 + *       permission, please contact [email protected].
40 + *
41 + * 5. Products derived from this software may not be called "Radiance",
42 + *       nor may "Radiance" appear in their name, without prior written
43 + *       permission of Lawrence Berkeley National Laboratory.
44 + *
45 + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 + * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 + * SUCH DAMAGE.
57 + * ====================================================================
58 + *
59 + * This software consists of voluntary contributions made by many
60 + * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 + * information on Lawrence Berkeley National Laboratory, please see
62 + * <http://www.lbl.gov/>.
63 + */
64 +
65   #include "standard.h"
66  
67   #include "font.h"
# Line 15 | Line 69 | static char SCCSid[] = "$SunId$ LBL";
69   #define galloc(nv)      (GLYPH *)malloc(sizeof(GLYPH)+2*sizeof(GORD)*(nv))
70  
71  
72 < extern char  *getlibpath();
72 > int     retainfonts = 0;                /* retain loaded fonts? */
73  
74   static FONT     *fontlist = NULL;       /* list of loaded fonts */
75  
# Line 33 | Line 87 | char  *fname;
87          register FONT  *f;
88  
89          for (f = fontlist; f != NULL; f = f->next)
90 <                if (!strcmp(f->name, fname))
90 >                if (!strcmp(f->name, fname)) {
91 >                        f->nref++;
92                          return(f);
93 +                }
94                                                  /* load the font file */
95          if ((pathname = getpath(fname, getlibpath(), R_OK)) == NULL) {
96                  sprintf(errmsg, "cannot find font file \"%s\"", fname);
# Line 44 | Line 100 | char  *fname;
100          if (f == NULL)
101                  goto memerr;
102          f->name = savestr(fname);
103 +        f->nref = 1;
104          if ((fp = fopen(pathname, "r")) == NULL) {
105                  sprintf(errmsg, "cannot open font file \"%s\"",
106                                  pathname);
107                  error(SYSTEM, errmsg);
108          }
109 <        wsum = hsum = ngly = 0;
110 <        while ((ngv = fgetval(fp, 'i', &gn)) != EOF) {  /* get each glyph */
109 >        wsum = hsum = ngly = 0;                 /* get each glyph */
110 >        while ((ngv = fgetval(fp, 'i', (char *)&gn)) != EOF) {
111                  if (ngv == 0)
112                          goto nonint;
113                  if (gn < 1 || gn > 255) {
# Line 61 | Line 118 | char  *fname;
118                          err = "duplicate";
119                          goto fonterr;
120                  }
121 <                if (fgetval(fp, 'i', &ngv) <= 0 || ngv < 0 || ngv > 32000) {
121 >                if (fgetval(fp, 'i', (char *)&ngv) <= 0 ||
122 >                                ngv < 0 || ngv > 32000) {
123                          err = "bad # vertices for";
124                          goto fonterr;
125                  }
# Line 73 | Line 131 | char  *fname;
131                  ngv *= 2;
132                  gp = gvlist(g);
133                  while (ngv--) {
134 <                        if (fgetval(fp, 'i', &gv) <= 0 || gv < 0 || gv > 255) {
134 >                        if (fgetval(fp, 'i', (char *)&gv) <= 0 ||
135 >                                        gv < 0 || gv > 255) {
136                                  err = "bad vertex for";
137                                  goto fonterr;
138                          }
# Line 116 | Line 175 | memerr:
175   }
176  
177  
178 < freefont(fname)                 /* free a font (free all if fname==NULL) */
179 < char  *fname;
178 > void
179 > freefont(fnt)                   /* release a font (free all if NULL) */
180 > FONT *fnt;
181   {
182          FONT  head;
183          register FONT  *fl, *f;
184          register int  i;
185 <
185 >                                        /* check reference count */
186 >        if (fnt != NULL && (fnt->nref-- > 1 | retainfonts))
187 >                return;
188          head.next = fontlist;
189          fl = &head;
190          while ((f = fl->next) != NULL)
191 <                if (fname == NULL || !strcmp(fname, f->name)) {
191 >                if ((fnt == NULL | fnt == f)) {
192                          fl->next = f->next;
193                          for (i = 0; i < 256; i++)
194                                  if (f->fg[i] != NULL)
195 <                                        free((char *)f->fg[i]);
195 >                                        free((void *)f->fg[i]);
196                          freestr(f->name);
197 <                        free((char *)f);
197 >                        free((void *)f);
198                  } else
199                          fl = f;
200          fontlist = head.next;

Diff Legend

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