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.16 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.26 by schorsch, Fri Jan 2 11:36:26 2004 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *  External symbols declared in view.h
8   */
9  
10 < /* ====================================================================
11 < * The Radiance Software License, Version 1.0
12 < *
13 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 < *
16 < * Redistribution and use in source and binary forms, with or without
17 < * modification, are permitted provided that the following conditions
18 < * are met:
19 < *
20 < * 1. Redistributions of source code must retain the above copyright
21 < *         notice, this list of conditions and the following disclaimer.
22 < *
23 < * 2. Redistributions in binary form must reproduce the above copyright
24 < *       notice, this list of conditions and the following disclaimer in
25 < *       the documentation and/or other materials provided with the
26 < *       distribution.
27 < *
28 < * 3. The end-user documentation included with the redistribution,
29 < *           if any, must include the following acknowledgment:
30 < *             "This product includes Radiance software
31 < *                 (http://radsite.lbl.gov/)
32 < *                 developed by the Lawrence Berkeley National Laboratory
33 < *               (http://www.lbl.gov/)."
34 < *       Alternately, this acknowledgment may appear in the software itself,
35 < *       if and wherever such third-party acknowledgments normally appear.
36 < *
37 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 < *       and "The Regents of the University of California" must
39 < *       not be used to endorse or promote products derived from this
40 < *       software without prior written permission. For written
41 < *       permission, please contact [email protected].
42 < *
43 < * 5. Products derived from this software may not be called "Radiance",
44 < *       nor may "Radiance" appear in their name, without prior written
45 < *       permission of Lawrence Berkeley National Laboratory.
46 < *
47 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 < * SUCH DAMAGE.
59 < * ====================================================================
60 < *
61 < * This software consists of voluntary contributions made by many
62 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 < * information on Lawrence Berkeley National Laboratory, please see
64 < * <http://www.lbl.gov/>.
65 < */
10 > #include "copyright.h"
11  
12 < #include  "standard.h"
68 <
12 > #include  "rtio.h"
13   #include  "view.h"
14  
71 #include  "paths.h"
15  
16   #define  FEQ(x,y)       (fabs((x)-(y)) <= FTINY)
17   #define  VEQ(v,w)       (FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \
# Line 76 | Line 19 | static const char      RCSid[] = "$Id$";
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 326 | Line 271 | FVECT  p;
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   {
# Line 449 | 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 544 | 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 576 | 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 603 | Line 552 | RESOLU  *rp;
552          mvs.hv = vp;
553          mvs.ok = 0;
554  
555 <        getheader(fp, (int (*)(char *, char *))&gethview, (char *)&mvs);
555 >        getheader(fp, gethview, &mvs);
556  
557          if (rp != NULL && !fgetsresolu(rp, fp))
558                  mvs.ok = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines