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

Comparing ray/src/rt/rpict.c (file contents):
Revision 2.105 by greg, Fri Nov 15 20:47:42 2024 UTC vs.
Revision 2.109 by greg, Tue Jul 1 19:40:35 2025 UTC

# Line 52 | Line 52 | extern RGBPRIMP  out_prims;            /* output color primitive
52  
53   int  dimlist[MAXDIM];                   /* sampling dimensions */
54   int  ndims = 0;                         /* number of sampling dimensions */
55 < int  samplendx;                         /* sample index number */
55 > unsigned long  samplendx;               /* sample index number */
56  
57   void  (*addobjnotify[])() = {ambnotify, NULL};
58  
# Line 134 | Line 134 | static int fillsample(COLOR *colline, float *zline, in
134                  int xlen, int ylen, int b);
135   static double pixvalue(COLOR  col, int  x, int  y);
136   static int salvage(char  *oldfile);
137 < static int pixnumber(int  x, int  y, int  xres, int  yres);
137 > static unsigned long pixnumber(int  x, int  y, int  xres, int  yres);
138  
139  
140  
# Line 289 | Line 289 | rpict(                 /* generate image(s) */
289          do {
290                  if (seq && nextview(stdin) == EOF)
291                          break;
292 +                lastview.type *= seq > 1;
293                  pctdone = 0.0;
294                  if (pout != NULL) {
295                          int     myfd;
# Line 341 | Line 342 | rpict(                 /* generate image(s) */
342                  fputs(VIEWSTR, stdout);
343                  fprintview(&ourview, stdout);
344                  putchar('\n');
345 <                if ((pa < .99) | (pa > 1.01))
345 >                if ((pa < .999) | (pa > 1.001))
346                          fputaspect(pa, stdout);
347                  fputnow(stdout);
348                  if (out_prims == xyzprims) {
# Line 701 | Line 702 | pixvalue(              /* compute pixel value */
702                  return(0.0);
703  
704          rayorigin(&thisray, PRIMARY, NULL, NULL);
705 < #ifdef SSKIPOPT
705 <        sskip_ray(&thisray, hpos, vpos);        /* source skip hack */
706 < #endif
705 >
706          rayvalue(&thisray);                     /* trace ray */
707                                                  /* -> color */
708          scolor_out(col, out_prims, thisray.rcol);
# Line 772 | Line 771 | writerr:
771          return -1; /* pro forma return */
772   }
773  
774 < static int
774 > static unsigned long
775   pixnumber(              /* compute pixel index (screen door) */
776          int  x,
777          int  y,
# Line 789 | Line 788 | pixnumber(             /* compute pixel index (screen door) */
788                  ++nbits;
789          }
790          coord[0] = x; coord[1] = y;
791 <        return ((int)hilbert_c2i(2, nbits, coord));
791 >        return((unsigned long)hilbert_c2i(2, nbits, coord));
792   }

Diff Legend

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