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

Comparing ray/src/common/image.c (file contents):
Revision 2.15 by gwlarson, Fri Feb 26 12:24:07 1999 UTC vs.
Revision 2.26 by schorsch, Fri Jan 2 11:36:26 2004 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1996 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  image.c - routines for image generation.
6 + *
7 + *  External symbols declared in view.h
8   */
9  
10 < #include  "standard.h"
10 > #include "copyright.h"
11  
12 + #include  "rtio.h"
13   #include  "view.h"
14  
15 – #include  "resolu.h"
15  
17 – #include  "paths.h"
18 –
16   #define  FEQ(x,y)       (fabs((x)-(y)) <= FTINY)
17   #define  VEQ(v,w)       (FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \
18                                  && FEQ((v)[2],(w)[2]))
19  
20   VIEW  stdview = STDVIEW;                /* default view parameters */
21  
22 + static gethfunc gethview;
23  
24 +
25   char *
26   setview(v)              /* set hvec and vvec, return message on error */
27   register VIEW  *v;
# Line 108 | Line 107 | register VIEW  *v;
107   }
108  
109  
110 + void
111   normaspect(va, ap, xp, yp)              /* fix pixel aspect or resolution */
112   double  va;                     /* view aspect ratio */
113   double  *ap;                    /* pixel aspect in (or out if 0) */
# Line 199 | Line 199 | double  x, y;
199   }
200  
201  
202 + void
203   viewloc(ip, v, p)               /* find image location for point */
204   FVECT  ip;
205   register VIEW  *v;
# Line 268 | Line 269 | FVECT  p;
269   }
270  
271  
272 + void
273   pix2loc(loc, rp, px, py)        /* compute image location from pixel pos. */
274 < FLOAT  loc[2];
274 > RREAL  loc[2];
275   register RESOLU  *rp;
276   int  px, py;
277   {
278          register int  x, y;
279  
280 <        if (rp->or & YMAJOR) {
280 >        if (rp->rt & YMAJOR) {
281                  x = px;
282                  y = py;
283          } else {
284                  x = py;
285                  y = px;
286          }
287 <        if (rp->or & XDECR)
287 >        if (rp->rt & XDECR)
288                  x = rp->xr-1 - x;
289 <        if (rp->or & YDECR)
289 >        if (rp->rt & YDECR)
290                  y = rp->yr-1 - y;
291          loc[0] = (x+.5)/rp->xr;
292          loc[1] = (y+.5)/rp->yr;
293   }
294  
295  
296 + void
297   loc2pix(pp, rp, lx, ly)         /* compute pixel pos. from image location */
298   int  pp[2];
299   register RESOLU  *rp;
# Line 300 | Line 303 | double  lx, ly;
303  
304          x = lx * rp->xr;
305          y = ly * rp->yr;
306 <        if (rp->or & XDECR)
306 >        if (rp->rt & XDECR)
307                  x = rp->xr-1 - x;
308 <        if (rp->or & YDECR)
308 >        if (rp->rt & YDECR)
309                  y = rp->yr-1 - y;
310 <        if (rp->or & YMAJOR) {
310 >        if (rp->rt & YMAJOR) {
311                  pp[0] = x;
312                  pp[1] = y;
313          } else {
# Line 391 | Line 394 | register char  *s;
394          int  na;
395          int  nvopts = 0;
396  
397 +        while (*s == ' ')
398 +                s++;
399          if (*s != '-')
400                  s = sskip2(s,1);
401          while (*s) {
402                  ac = 0;
403                  do {
404 <                        av[ac++] = s;
404 >                        if (ac || *s == '-')
405 >                                av[ac++] = s;
406                          while (*s && *s != ' ')
407                                  s++;
408                          while (*s == ' ')
# Line 413 | Line 419 | register char  *s;
419   }
420  
421  
422 + void
423   fprintview(vp, fp)                      /* write out view parameters */
424   register VIEW  *vp;
425   FILE  *fp;
# Line 485 | Line 492 | int
492   isview(s)                               /* is this a view string? */
493   char  *s;
494   {
495 <        static char  *altname[]={NULL,VIEWSTR,"rpict","rview","pinterp",NULL};
495 >        static char  *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL};
496          extern char  *progname;
497          register char  *cp;
498          register char  **an;
# Line 517 | Line 524 | struct myview {
524  
525  
526   static int
527 < gethview(s, v)                          /* get view from header */
528 < char  *s;
529 < register struct myview  *v;
527 > gethview(                               /* get view from header */
528 >        char  *s,
529 >        void  *v
530 > )
531   {
532 <        if (isview(s) && sscanview(v->hv, s) > 0)
533 <                v->ok++;
532 >        if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0)
533 >                ((struct myview*)v)->ok++;
534          return(0);
535   }
536  
# Line 536 | Line 544 | RESOLU  *rp;
544          struct myview   mvs;
545          FILE  *fp;
546  
547 <        if ((fp = fopen(fname, "r")) == NULL)
547 >        if (fname == NULL || !strcmp(fname, "-"))
548 >                fp = stdin;
549 >        else if ((fp = fopen(fname, "r")) == NULL)
550                  return(-1);
551  
552          mvs.hv = vp;

Diff Legend

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