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

Comparing ray/src/common/image.c (file contents):
Revision 2.22 by schorsch, Fri Nov 14 17:22:06 2003 UTC vs.
Revision 2.27 by greg, Thu Feb 12 18:55:50 2004 UTC

# Line 10 | Line 10 | static const char      RCSid[] = "$Id$";
10   #include "copyright.h"
11  
12   #include  "rtio.h"
13 + #include  "paths.h"
14   #include  "view.h"
15  
16  
# Line 19 | Line 20 | static const char      RCSid[] = "$Id$";
20  
21   VIEW  stdview = STDVIEW;                /* default view parameters */
22  
23 + static gethfunc gethview;
24  
25 +
26   char *
27   setview(v)              /* set hvec and vvec, return message on error */
28   register VIEW  *v;
# Line 490 | Line 493 | int
493   isview(s)                               /* is this a view string? */
494   char  *s;
495   {
496 <        static char  *altname[]={NULL,VIEWSTR,"rpict","rview","pinterp",NULL};
496 >        static char  *altname[]={NULL,VIEWSTR,"rpict","rview","rvu","rpiece","pinterp",NULL};
497          extern char  *progname;
498          register char  *cp;
499          register char  **an;
# Line 522 | Line 525 | struct myview {
525  
526  
527   static int
528 < gethview(s, v)                          /* get view from header */
529 < char  *s;
530 < register struct myview  *v;
528 > gethview(                               /* get view from header */
529 >        char  *s,
530 >        void  *v
531 > )
532   {
533 <        if (isview(s) && sscanview(v->hv, s) > 0)
534 <                v->ok++;
533 >        if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0)
534 >                ((struct myview*)v)->ok++;
535          return(0);
536   }
537  
# Line 549 | Line 553 | RESOLU  *rp;
553          mvs.hv = vp;
554          mvs.ok = 0;
555  
556 <        getheader(fp, (int (*)(char *, char *))&gethview, (char *)&mvs);
556 >        getheader(fp, gethview, &mvs);
557  
558          if (rp != NULL && !fgetsresolu(rp, fp))
559                  mvs.ok = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines