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

Comparing ray/src/px/pcomb.c (file contents):
Revision 2.47 by greg, Fri Jan 12 00:50:17 2018 UTC vs.
Revision 2.48 by greg, Sat Jan 13 00:35:55 2018 UTC

# Line 212 | Line 212 | main(
212                          }
213                  break;
214          }
215 <                                                /* set/get output resolution */
216 <        if (!vardefined(vxres))
217 <                varset(vxres, ':', (double)xmax);
218 <        if (!vardefined(vyres))
219 <                varset(vyres, ':', (double)ymax);
215 >                                                /* get output resolution */
216          xres = varvalue(vxres) + .5;
217          yres = varvalue(vyres) + .5;
218          if (xres <= 0 || yres <= 0) {
# Line 371 | Line 367 | init(void)                                     /* perform final setup */
367                  ourbright = xyz_bright;
368          } else
369                  varset(vwhteff, ':', WHTEFFICACY);
370 +                                                /* these may be overridden */
371 +        varset(vxres, ':', (double)xmax);
372 +        varset(vyres, ':', (double)ymax);
373   }
374  
375  

Diff Legend

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