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

Comparing ray/src/px/pfilt.c (file contents):
Revision 2.15 by greg, Mon Oct 16 12:04:36 1995 UTC vs.
Revision 2.17 by greg, Mon Apr 1 17:24:44 1996 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1992 Regents of the University of California */
1 > /* Copyright (c) 1996 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 17 | Line 17 | static char SCCSid[] = "$SunId$ LBL";
17  
18   #include  "color.h"
19  
20 + #include  "view.h"
21 +
22   #include  "resolu.h"
23  
24   #include  "paths.h"
# Line 64 | Line 66 | int  correctaspect = 0;                /* aspect ratio correction? *
66  
67   int  wrongformat = 0;
68  
69 + VIEW  ourview = STDVIEW;
70 + int  gotview = 0;
71 + int  wrapfilt = 0;              /* wrap filter horizontally? */
72 +
73   int  xrad;                      /* x search radius */
74   int  yrad;                      /* y search radius */
75   int  xbrad;                     /* x box size */
# Line 267 | Line 273 | char  **argv;
273          }
274          if (!(order & YMAJOR))
275                  inpaspect = 1.0/inpaspect;
276 +                                        /* wrap around for cylindrical view? */
277 +        wrapfilt = gotview && ourview.type == VT_CYL &&
278 +                        ourview.horiz >= 360.-FTINY && order & YMAJOR;
279                                          /* compute output resolution */
280          if (ncols <= 0)
281                  ncols = x_c*xres + .5;
# Line 339 | Line 348 | char  *s;
348                          ourbright = xyz_bright;
349                  else
350                          wrongformat = !globmatch(PICFMT, fmt);
351 <        }
351 >        } else if (isview(s) && sscanview(&ourview, s) > 0)
352 >                gotview++;
353   }
354  
355  
# Line 454 | Line 464 | scan2init()                    /* prepare scanline arrays */
464                          rad *= (y_r + x_c)/2.0;
465  
466                  if (thresh > FTINY) {
457 –                        xrad = CHECKRAD*THRESHRAD*rad/x_c + xbrad;
458 –                        yrad = CHECKRAD*THRESHRAD*rad/y_r + ybrad;
467                          orad = CHECKRAD*THRESHRAD*rad + 1;
468 +                        xrad = orad/x_c + xbrad;
469 +                        yrad = orad/y_r + ybrad;
470                          obarsize = 2*orad + 1;
471                  } else {
472                          xrad = CHECKRAD*rad/x_c + 1;
# Line 526 | Line 536 | int  r;
536          int  ybot;
537          register int  c;
538                                          /* average input scanlines */
539 <        while (nextrow < r+orad && nextrow < nrows) {
539 >        while (nextrow <= r+orad && nextrow < nrows) {
540                  ybot = (long)nextrow*yres/nrows;
541                  for (c = 0; c < ncols; c++) {
542                          dobox(ctmp, (int)((long)c*xres/ncols),ybot, c,nextrow);

Diff Legend

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