--- ray/src/common/font.c 2003/02/22 02:07:22 2.12
+++ ray/src/common/font.c 2004/03/26 23:04:23 2.19
@@ -1,69 +1,17 @@
#ifndef lint
-static const char RCSid[] = "$Id: font.c,v 2.12 2003/02/22 02:07:22 greg Exp $";
+static const char RCSid[] = "$Id: font.c,v 2.19 2004/03/26 23:04:23 greg Exp $";
#endif
/*
* Polygonal font handling routines
*/
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes Radiance software
- * (http://radsite.lbl.gov/)
- * developed by the Lawrence Berkeley National Laboratory
- * (http://www.lbl.gov/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- * and "The Regents of the University of California" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- * nor may "Radiance" appear in their name, without prior written
- * permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory. For more
- * information on Lawrence Berkeley National Laboratory, please see
- * .
- */
+#include "copyright.h"
-#include "standard.h"
+#include
+#include "paths.h"
+#include "rtio.h"
+#include "rterror.h"
#include "font.h"
#define galloc(nv) (GLYPH *)malloc(sizeof(GLYPH)+2*sizeof(GORD)*(nv))
@@ -79,7 +27,7 @@ getfont(fname) /* return font fname */
char *fname;
{
FILE *fp;
- char *pathname, *err;
+ char *pathname, *err = NULL;
unsigned wsum, hsum, ngly;
int gn, ngv, gv;
register GLYPH *g;
@@ -92,7 +40,7 @@ char *fname;
return(f);
}
/* load the font file */
- if ((pathname = getpath(fname, getlibpath(), R_OK)) == NULL) {
+ if ((pathname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
sprintf(errmsg, "cannot find font file \"%s\"", fname);
error(USER, errmsg);
}
@@ -172,6 +120,7 @@ fonterr:
error(USER, errmsg);
memerr:
error(SYSTEM, "out of memory in fontglyph");
+ return NULL; /* pro forma return */
}
@@ -183,12 +132,12 @@ FONT *fnt;
register FONT *fl, *f;
register int i;
/* check reference count */
- if (fnt != NULL && (fnt->nref-- > 1 | retainfonts))
+ if (fnt != NULL && ((fnt->nref-- > 1) | retainfonts))
return;
head.next = fontlist;
fl = &head;
while ((f = fl->next) != NULL)
- if ((fnt == NULL | fnt == f)) {
+ if ((fnt == NULL) | (fnt == f)) {
fl->next = f->next;
for (i = 0; i < 256; i++)
if (f->fg[i] != NULL)
@@ -262,7 +211,7 @@ FONT *f; /* font */
int cis; /* target intercharacter spacing */
int nsi; /* minimum number of spaces for indent */
{
- register char *end, *tab;
+ register char *end, *tab = NULL;
GLYPH *gp;
short *nsp;
int alen, len, width;