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

Comparing ray/src/rt/text.c (file contents):
Revision 2.29 by greg, Wed Nov 15 18:02:53 2023 UTC vs.
Revision 2.30 by greg, Tue Dec 3 19:36:58 2024 UTC

# Line 294 | Line 294 | intext(                        /* check to see if p is in text glyph */
294                  x *= 255.;
295          h = x;
296          i = y = DOT(v, tp->down);
297 <        if (x < 0.0 || y < 0.0)
297 >        if ((x < 0.0) | (y < 0.0))
298                  return(0);
299          x -= (double)h;
300          y = ((i+1) - y)*255.;
# Line 328 | Line 328 | inglyph(               /* (x,y) within font glyph gl? */
328                  return(0);
329          xlb = x;
330          ylb = y;
331 <        if (gl->left > xlb || gl->right <= xlb ||       /* check extent */
332 <                        gl->bottom > ylb || gl->top <= ylb)
331 >        if ((gl->left > xlb) | (gl->right <= xlb) |     /* check extent */
332 >                        (gl->bottom > ylb) | (gl->top <= ylb))
333                  return(0);
334          xlb = xlb<<1 | 1;               /* add 1/2 to test points... */
335          ylb = ylb<<1 | 1;               /* ...so no equal comparisons */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines