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

Comparing ray/src/rt/devmain.c (file contents):
Revision 2.3 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.6 by greg, Thu Feb 9 21:54:11 2023 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *      Redefine your initialization routine to dinit.
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"
13  
# Line 146 | Line 91 | r_paintr()                             /* paint a rectangle */
91          COLOR   col;
92          int     xmin, ymin, xmax, ymax;
93  
94 <        fread((char *)col, sizeof(COLOR), 1, devin);
94 >        getbinary((char *)col, sizeof(COLOR), 1, devin);
95          xmin = getw(devin); ymin = getw(devin);
96          xmax = getw(devin); ymax = getw(devin);
97          (*dev->paintr)(col, xmin, ymin, xmax, ymax);
# Line 182 | Line 127 | r_getcur()                             /* get and return cursor position */
127   }
128  
129  
130 + void
131 + mygets(char *s, FILE *fp)                       /* get string from file (with nul) */
132 + {
133 +        int     c;
134 +
135 +        while ((c = getc(fp)) != EOF)
136 +                if ((*s++ = c) == '\0')
137 +                        return;
138 +        *s = '\0';
139 + }
140 +
141 +
142 + void
143 + myputs(const char *s, FILE *fp)                 /* put string to file (with nul) */
144 + {
145 +        do
146 +                putc(*s, fp);
147 +        while (*s++);
148 + }
149 +
150 +
151   r_comout()                              /* print string to command line */
152   {
153          char    str[256];
# Line 210 | Line 176 | r_comin()                              /* read string from command line */
176   }
177  
178  
213 – mygets(s, fp)                           /* get string from file (with nul) */
214 – register char   *s;
215 – register FILE   *fp;
216 – {
217 –        register int    c;
218 –
219 –        while ((c = getc(fp)) != EOF)
220 –                if ((*s++ = c) == '\0')
221 –                        return;
222 –        *s = '\0';
223 – }
224 –
225 –
226 – myputs(s, fp)                           /* put string to file (with nul) */
227 – register char   *s;
228 – register FILE   *fp;
229 – {
230 –        do
231 –                putc(*s, fp);
232 –        while (*s++);
233 – }
234 –
235 –
179   void
180 < eputs(s)                                /* put string to stderr */
238 < register char  *s;
180 > eputs(const char *s)                            /* put string to stderr */
181   {
182          static int  midline = 0;
183  
# Line 255 | Line 197 | register char  *s;
197  
198   sendstate()                             /* send driver state variables */
199   {
200 <        fwrite((char *)&dev->pixaspect, sizeof(dev->pixaspect), 1, devout);
200 >        putbinary(&dev->pixaspect, sizeof(dev->pixaspect), 1, devout);
201          putw(dev->xsiz, devout);
202          putw(dev->ysiz, devout);
203          putw(dev->inpready, devout);

Diff Legend

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