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

Comparing ray/src/ot/wfconv.c (file contents):
Revision 2.14 by greg, Wed Jun 11 00:08:30 2014 UTC vs.
Revision 2.17 by greg, Thu Mar 11 17:00:58 2021 UTC

# Line 261 | Line 261 | dominant_axis(char *v1, char *v2, char *v3)
261          for (i = imax = 2; i--; )
262                  if (vn[i]*vn[i] > vn[imax]*vn[imax])
263                          imax = i;
264 <        return(vn[imax]*vn[imax] > FTINY*FTINY ? imax : -1);
264 >        return(vn[imax]*vn[imax] > FTINY*FTINY*FTINY*FTINY ? imax : -1);
265   }
266  
267   /* callback for triangle output from polygon */
# Line 279 | Line 279 | putface(                               /* put out an N-sided polygon */
279          char    **av
280   )
281   {
282 <        Vert2_list      *poly = polyAlloc(ac);
282 >        Vert2_list      *poly;
283          int             i, ax, ay;
284  
285        if (poly == NULL)
286                return(0);
287        poly->p = (void *)av;
285          for (i = ac-3; i >= 0; i--)     /* identify dominant axis */
286                  if ((ax = dominant_axis(av[i], av[i+1], av[i+2])) >= 0)
287                          break;
288          if (ax < 0)
289                  return(1);              /* ignore degenerate face */
290 +        poly = polyAlloc(ac);
291 +        if (poly == NULL)
292 +                return(0);
293 +        poly->p = (void *)av;
294          if (++ax >= 3) ax = 0;
295          ay = ax;
296          if (++ay >= 3) ay = 0;
# Line 468 | Line 469 | syntax(                        /* report syntax error and exit */
469          char    *er
470   )
471   {
472 <        sprintf(errmsg, "%s: Wavefront syntax error near line %d: %s\n",
472 >        sprintf(errmsg, "%s: Wavefront syntax error near line %d: %s",
473                          inpfile, lineno, er);
474          error(USER, errmsg);
475   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines