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

Comparing ray/src/rt/rpict.c (file contents):
Revision 2.52 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.55 by schorsch, Thu Jun 5 19:29:34 2003 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id";
3   #endif
4   /*
5   *  rpict.c - routines and variables for picture generation.
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
11 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 < *
14 < * Redistribution and use in source and binary forms, with or without
15 < * modification, are permitted provided that the following conditions
16 < * are met:
17 < *
18 < * 1. Redistributions of source code must retain the above copyright
19 < *         notice, this list of conditions and the following disclaimer.
20 < *
21 < * 2. Redistributions in binary form must reproduce the above copyright
22 < *       notice, this list of conditions and the following disclaimer in
23 < *       the documentation and/or other materials provided with the
24 < *       distribution.
25 < *
26 < * 3. The end-user documentation included with the redistribution,
27 < *           if any, must include the following acknowledgment:
28 < *             "This product includes Radiance software
29 < *                 (http://radsite.lbl.gov/)
30 < *                 developed by the Lawrence Berkeley National Laboratory
31 < *               (http://www.lbl.gov/)."
32 < *       Alternately, this acknowledgment may appear in the software itself,
33 < *       if and wherever such third-party acknowledgments normally appear.
34 < *
35 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 < *       and "The Regents of the University of California" must
37 < *       not be used to endorse or promote products derived from this
38 < *       software without prior written permission. For written
39 < *       permission, please contact [email protected].
40 < *
41 < * 5. Products derived from this software may not be called "Radiance",
42 < *       nor may "Radiance" appear in their name, without prior written
43 < *       permission of Lawrence Berkeley National Laboratory.
44 < *
45 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 < * SUCH DAMAGE.
57 < * ====================================================================
58 < *
59 < * This software consists of voluntary contributions made by many
60 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 < * information on Lawrence Berkeley National Laboratory, please see
62 < * <http://www.lbl.gov/>.
63 < */
8 > #include "copyright.h"
9  
10   #include  "ray.h"
11  
# Line 76 | Line 21 | static const char      RCSid[] = "$Id$";
21   #endif
22   #endif
23  
24 < extern time_t   time();
80 <
24 > #include  <time.h>
25   #include  <signal.h>
26  
27 + #include  "platform.h"
28   #include  "view.h"
84
29   #include  "random.h"
86
30   #include  "paths.h"
31  
32 +
33   #define  RFTEMPLATE     "rfXXXXXX"
34  
35   #ifndef SIGCONT
# Line 163 | Line 107 | int  hres, vres;                       /* resolution for this frame */
107  
108   static VIEW     lastview;               /* the previous view input */
109  
110 < extern char  *mktemp();
110 > extern char  *mktemp();  /* XXX should be in stdlib.h or unistd.h */
111  
112   void  report();
113  
# Line 268 | Line 212 | char  *pout, *zout, *prvr;
212   * sequenced file naming.
213   */
214   {
271        extern char  *rindex(), *strncpy(), *strcat(), *strcpy();
215          char  fbuf[128], fbuf2[128];
216          int  npicts;
217          register char  *cp;
# Line 345 | Line 288 | char  *pout, *zout, *prvr;
288                                          "cannot open output file \"%s\"", fbuf);
289                                  error(SYSTEM, errmsg);
290                          }
291 < #ifdef MSDOS
349 <                        setmode(fileno(stdout), O_BINARY);
350 < #endif
291 >                        SET_FILE_BINARY(stdout);
292                          dupheader();
293                  }
294                  hres = hresolu; vres = vresolu; pa = pixaspect;
# Line 449 | Line 390 | char  *zfile, *oldfile;
390                          sprintf(errmsg, "cannot open z-file \"%s\"", zfile);
391                          error(SYSTEM, errmsg);
392                  }
393 < #ifdef MSDOS
453 <                setmode(zfd, O_BINARY);
454 < #endif
393 >                SET_FD_BINARY(zfd);
394                  for (i = 0; i <= psample; i++) {
395                          zbar[i] = (float *)malloc(hres*sizeof(float));
396                          if (zbar[i] == NULL)
# Line 733 | Line 672 | char  *oldfile;
672                  error(WARNING, errmsg);
673                  goto gotzip;
674          }
675 < #ifdef MSDOS
737 <        setmode(fileno(fp), O_BINARY);
738 < #endif
675 >        SET_FILE_BINARY(fp);
676                                  /* discard header */
677          getheader(fp, NULL, NULL);
678                                  /* get picture size */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines