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

Comparing ray/src/px/pinterp.c (file contents):
Revision 2.50 by greg, Thu May 14 20:51:02 2020 UTC vs.
Revision 2.54 by greg, Tue Jul 1 19:40:35 2025 UTC

# Line 64 | Line 64 | COLOR  *ourbpict = NULL;               /* blurred picture (view aver
64   VIEW    avgview;                        /* average view for -B option */
65   int     nvavg;                          /* number of views averaged */
66  
67 – char    *progname;
68 –
67   int     fillo = F_FORE|F_BACK;          /* selected fill options */
68   int     fillsamp = 0;                   /* sample separation (0 == inf) */
69   COLR    backcolr = BLKCOLR;             /* background color */
70   COLOR   backcolor = BLKCOLOR;           /* background color (float) */
71   double  backz = 0.0;                    /* background z value */
72   int     normdist = 1;                   /* i/o normalized distance? */
73 < char    ourfmt[LPICFMT+1] = PICFMT;     /* original picture format */
73 > char    ourfmt[MAXFMTLEN] = PICFMT;     /* original picture format */
74   double  ourexp = -1;                    /* original picture exposure */
75   int     expadj = 0;                     /* exposure adjustment (f-stops) */
76   double  rexpadj = 1;                    /* real exposure adjustment */
# Line 137 | Line 135 | main(                  /* interpolate pictures */
135          SET_DEFAULT_BINARY();
136          SET_FILE_BINARY(stdout);
137  
138 <        progname = argv[0];
138 >        fixargv0(argv[0]);              /* sets global progname */
139  
140          for (an = 1; an < argc && argv[an][0] == '-'; an++) {
141                  rval = getviewopt(&ourview, argc-an, argv+an);
# Line 328 | Line 326 | main(                  /* interpolate pictures */
326                  fprintview(&avgview, stdout);
327                  putc('\n', stdout);
328          }
329 <        if ((pixaspect < .99) | (pixaspect > 1.01))
329 >        if ((pixaspect < .999) | (pixaspect > 1.001))
330                  fputaspect(pixaspect, stdout);
331          if (ourexp > 0)
332                  ourexp *= rexpadj;
# Line 1246 | Line 1244 | clearqueue(void)                               /* process queue */
1244          }
1245                                          /* mark end and get results */
1246          memset((char *)fbp, '\0', 6*sizeof(float));
1247 <        if (process(&PDesc, (char *)fbuf, (char *)fbuf,
1247 >        if (process(&PDesc, fbuf, fbuf,
1248                          4*sizeof(float)*(queuesiz+1),
1249                          6*sizeof(float)*(queuesiz+1)) !=
1250                          4*sizeof(float)*(queuesiz+1)) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)