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.12 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.19 by greg, Fri Mar 26 23:04:23 2004 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
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 < */
8 > #include "copyright.h"
9  
10 < #include "standard.h"
10 > #include <stdlib.h>
11  
12 + #include "paths.h"
13 + #include "rtio.h"
14 + #include "rterror.h"
15   #include "font.h"
16  
17   #define galloc(nv)      (GLYPH *)malloc(sizeof(GLYPH)+2*sizeof(GORD)*(nv))
# Line 79 | Line 27 | getfont(fname)                         /* return font fname */
27   char  *fname;
28   {
29          FILE  *fp;
30 <        char  *pathname, *err;
30 >        char  *pathname, *err = NULL;
31          unsigned  wsum, hsum, ngly;
32          int  gn, ngv, gv;
33          register GLYPH  *g;
# Line 92 | Line 40 | char  *fname;
40                          return(f);
41                  }
42                                                  /* load the font file */
43 <        if ((pathname = getpath(fname, getlibpath(), R_OK)) == NULL) {
43 >        if ((pathname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
44                  sprintf(errmsg, "cannot find font file \"%s\"", fname);
45                  error(USER, errmsg);
46          }
# Line 172 | Line 120 | fonterr:
120          error(USER, errmsg);
121   memerr:
122          error(SYSTEM, "out of memory in fontglyph");
123 +        return NULL; /* pro forma return */
124   }
125  
126  
# Line 183 | Line 132 | FONT *fnt;
132          register FONT  *fl, *f;
133          register int  i;
134                                          /* check reference count */
135 <        if (fnt != NULL && (fnt->nref-- > 1 | retainfonts))
135 >        if (fnt != NULL && ((fnt->nref-- > 1) | retainfonts))
136                  return;
137          head.next = fontlist;
138          fl = &head;
139          while ((f = fl->next) != NULL)
140 <                if ((fnt == NULL | fnt == f)) {
140 >                if ((fnt == NULL) | (fnt == f)) {
141                          fl->next = f->next;
142                          for (i = 0; i < 256; i++)
143                                  if (f->fg[i] != NULL)
# Line 262 | Line 211 | FONT  *f;                      /* font */
211   int  cis;                       /* target intercharacter spacing */
212   int  nsi;                       /* minimum number of spaces for indent */
213   {
214 <        register char  *end, *tab;
214 >        register char  *end, *tab = NULL;
215          GLYPH  *gp;
216          short  *nsp;
217          int  alen, len, width;

Diff Legend

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