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.15 by gwlarson, Fri Feb 26 12:24:07 1999 UTC vs.
Revision 2.16 by greg, Sat Feb 22 02:07:22 2003 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 + /* ====================================================================
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 + */
66 +
67   #include  "standard.h"
68  
69   #include  "view.h"
70  
15 – #include  "resolu.h"
16 –
71   #include  "paths.h"
72  
73   #define  FEQ(x,y)       (fabs((x)-(y)) <= FTINY)
# Line 108 | Line 162 | register VIEW  *v;
162   }
163  
164  
165 + void
166   normaspect(va, ap, xp, yp)              /* fix pixel aspect or resolution */
167   double  va;                     /* view aspect ratio */
168   double  *ap;                    /* pixel aspect in (or out if 0) */
# Line 199 | Line 254 | double  x, y;
254   }
255  
256  
257 + void
258   viewloc(ip, v, p)               /* find image location for point */
259   FVECT  ip;
260   register VIEW  *v;
# Line 268 | Line 324 | FVECT  p;
324   }
325  
326  
327 + void
328   pix2loc(loc, rp, px, py)        /* compute image location from pixel pos. */
329   FLOAT  loc[2];
330   register RESOLU  *rp;
# Line 275 | Line 332 | int  px, py;
332   {
333          register int  x, y;
334  
335 <        if (rp->or & YMAJOR) {
335 >        if (rp->rt & YMAJOR) {
336                  x = px;
337                  y = py;
338          } else {
339                  x = py;
340                  y = px;
341          }
342 <        if (rp->or & XDECR)
342 >        if (rp->rt & XDECR)
343                  x = rp->xr-1 - x;
344 <        if (rp->or & YDECR)
344 >        if (rp->rt & YDECR)
345                  y = rp->yr-1 - y;
346          loc[0] = (x+.5)/rp->xr;
347          loc[1] = (y+.5)/rp->yr;
348   }
349  
350  
351 + void
352   loc2pix(pp, rp, lx, ly)         /* compute pixel pos. from image location */
353   int  pp[2];
354   register RESOLU  *rp;
# Line 300 | Line 358 | double  lx, ly;
358  
359          x = lx * rp->xr;
360          y = ly * rp->yr;
361 <        if (rp->or & XDECR)
361 >        if (rp->rt & XDECR)
362                  x = rp->xr-1 - x;
363 <        if (rp->or & YDECR)
363 >        if (rp->rt & YDECR)
364                  y = rp->yr-1 - y;
365 <        if (rp->or & YMAJOR) {
365 >        if (rp->rt & YMAJOR) {
366                  pp[0] = x;
367                  pp[1] = y;
368          } else {
# Line 413 | Line 471 | register char  *s;
471   }
472  
473  
474 + void
475   fprintview(vp, fp)                      /* write out view parameters */
476   register VIEW  *vp;
477   FILE  *fp;
# Line 536 | Line 595 | RESOLU  *rp;
595          struct myview   mvs;
596          FILE  *fp;
597  
598 <        if ((fp = fopen(fname, "r")) == NULL)
598 >        if (fname == NULL || !strcmp(fname, "-"))
599 >                fp = stdin;
600 >        else if ((fp = fopen(fname, "r")) == NULL)
601                  return(-1);
602  
603          mvs.hv = vp;
604          mvs.ok = 0;
605  
606 <        getheader(fp, gethview, &mvs);
606 >        getheader(fp, (int (*)(char *, char *))&gethview, (char *)&mvs);
607  
608          if (rp != NULL && !fgetsresolu(rp, fp))
609                  mvs.ok = 0;

Diff Legend

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