--- ray/src/rt/text.c 2003/02/25 02:47:23 2.21 +++ ray/src/rt/text.c 2003/07/27 22:12:03 2.23 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: text.c,v 2.21 2003/02/25 02:47:23 greg Exp $"; +static const char RCSid[] = "$Id: text.c,v 2.23 2003/07/27 22:12:03 schorsch Exp $"; #endif /* * text.c - functions for text patterns and mixtures. @@ -196,7 +196,7 @@ register OBJREC *tm; tlp = tlp->next; } else { /* text file */ if ((s = getpath(tm->oargs.sarg[tndx(tm)], - getlibpath(), R_OK)) == NULL) { + getrlibpath(), R_OK)) == NULL) { sprintf(errmsg, "cannot find text file \"%s\"", tm->oargs.sarg[tndx(tm)]); error(USER, errmsg); @@ -325,7 +325,7 @@ register GLYPH *gl; /* positive x axis cross test */ while (n--) { if ((p0[1]<<1 > ylb) ^ (p1[1]<<1 > ylb)) { - tv = p0[0]<<1 > xlb | (p1[0]<<1 > xlb) << 1; + tv = (p0[0]<<1 > xlb) | ((p1[0]<<1 > xlb) << 1); if (tv == 03) ncross++; else if (tv)