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

Comparing src/common/resolu.c (file contents):
Revision 2.2 by greg, Thu Nov 28 10:31:04 1991 UTC vs.
Revision 2.3 by greg, Sat Feb 22 02:07:22 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1991 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   * Read and write image resolutions.
6 + *
7 + * Externals declared in resolu.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 <stdio.h>
68 + #include <stdlib.h>
69 + #include <time.h>
70  
71   #include "resolu.h"
72  
# Line 16 | Line 74 | static char SCCSid[] = "$SunId$ LBL";
74   char  resolu_buf[RESOLU_BUFLEN];        /* resolution line buffer */
75  
76  
77 + void
78   fputresolu(ord, sl, ns, fp)             /* put out picture dimensions */
79   int  ord;                       /* scanline ordering */
80   int  sl, ns;                    /* scanline length and number */
# Line 23 | Line 82 | FILE  *fp;
82   {
83          RESOLU  rs;
84  
85 <        if ((rs.or = ord) & YMAJOR) {
85 >        if ((rs.rt = ord) & YMAJOR) {
86                  rs.xr = sl;
87                  rs.yr = ns;
88          } else {
# Line 43 | Line 102 | FILE  *fp;
102  
103          if (!fgetsresolu(&rs, fp))
104                  return(-1);
105 <        if (rs.or & YMAJOR) {
105 >        if (rs.rt & YMAJOR) {
106                  *sl = rs.xr;
107                  *ns = rs.yr;
108          } else {
109                  *sl = rs.yr;
110                  *ns = rs.xr;
111          }
112 <        return(rs.or);
112 >        return(rs.rt);
113   }
114  
115  
# Line 59 | Line 118 | resolu2str(buf, rp)            /* convert resolution struct to l
118   char  *buf;
119   register RESOLU  *rp;
120   {
121 <        if (rp->or&YMAJOR)
121 >        if (rp->rt&YMAJOR)
122                  sprintf(buf, "%cY %d %cX %d\n",
123 <                                rp->or&YDECR ? '-' : '+', rp->yr,
124 <                                rp->or&XDECR ? '-' : '+', rp->xr);
123 >                                rp->rt&YDECR ? '-' : '+', rp->yr,
124 >                                rp->rt&XDECR ? '-' : '+', rp->xr);
125          else
126                  sprintf(buf, "%cX %d %cY %d\n",
127 <                                rp->or&XDECR ? '-' : '+', rp->xr,
128 <                                rp->or&YDECR ? '-' : '+', rp->yr);
127 >                                rp->rt&XDECR ? '-' : '+', rp->xr,
128 >                                rp->rt&YDECR ? '-' : '+', rp->yr);
129          return(buf);
130   }
131  
132  
133 + int
134   str2resolu(rp, buf)             /* convert resolution line to struct */
135   register RESOLU  *rp;
136   char  *buf;
# Line 88 | Line 148 | char  *buf;
148                          yndx = cp;
149          if (xndx == NULL || yndx == NULL)
150                  return(0);
151 <        rp->or = 0;
152 <        if (xndx > yndx) rp->or |= YMAJOR;
153 <        if (xndx[-1] == '-') rp->or |= XDECR;
154 <        if (yndx[-1] == '-') rp->or |= YDECR;
151 >        rp->rt = 0;
152 >        if (xndx > yndx) rp->rt |= YMAJOR;
153 >        if (xndx[-1] == '-') rp->rt |= XDECR;
154 >        if (yndx[-1] == '-') rp->rt |= YDECR;
155          if ((rp->xr = atoi(xndx+1)) <= 0)
156                  return(0);
157          if ((rp->yr = atoi(yndx+1)) <= 0)

Diff Legend

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