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

Comparing ray/src/common/portio.c (file contents):
Revision 2.6 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.20 by greg, Thu Jul 4 02:06:32 2019 UTC

# Line 4 | Line 4 | static const char      RCSid[] = "$Id$";
4   /*
5   * Portable i/o for binary files
6   *
7 < * External symbols declared in standard.h
7 > * External symbols declared in rtio.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 <stdio.h>
12 > #include "rtio.h"
13  
14 < #ifndef frexp
70 < extern double  frexp();
71 < #endif
72 < #ifndef ldexp
73 < extern double  ldexp();
74 < #endif
14 > #include <math.h>
15  
16  
17   void
18 < putstr(s, fp)                   /* write null-terminated string to fp */
19 < register char  *s;
20 < register FILE  *fp;
18 > putstr(                         /* write null-terminated string to fp */
19 >        char  *s,
20 >        FILE  *fp
21 > )
22   {
23          do
24                  putc(*s, fp);
# Line 86 | Line 27 | register FILE  *fp;
27  
28  
29   void
30 < putint(i, siz, fp)              /* write a siz-byte integer to fp */
31 < long  i;
32 < register int  siz;
33 < register FILE  *fp;
30 > putint(                         /* write a siz-byte integer to fp */
31 >        long  i,
32 >        int  siz,
33 >        FILE  *fp
34 > )
35   {
36 <        while (siz--)
37 <                putc((int)(i>>(siz<<3) & 0xff), fp);
36 >        siz <<= 3;
37 >        while ((siz -= 8) >= 0)
38 >                putc((int)(i>>siz & 0xff), fp);
39   }
40  
41  
42   void
43 < putflt(f, fp)                   /* put out floating point number */
44 < double  f;
45 < FILE  *fp;
43 > putflt(                         /* put out floating point number */
44 >        double  f,
45 >        FILE  *fp
46 > )
47   {
48 +        long  m;
49          int  e;
50  
51 <        putint((long)(frexp(f,&e)*0x7fffffff), 4, fp);
51 >        m = frexp(f, &e) * 0x7fffffff;
52 >        if (e > 127) {                  /* overflow */
53 >                m = m > 0 ? (long)0x7fffffff : -(long)0x7fffffff;
54 >                e = 127;
55 >        } else if (e < -128) {          /* underflow */
56 >                m = 0;
57 >                e = 0;
58 >        }
59 >        putint(m, 4, fp);
60          putint((long)e, 1, fp);
61   }
62  
63  
64 + int
65 + putbinary(                      /* fwrite() replacement for small objects */
66 +        const void *p,
67 +        int elsiz,
68 +        int nel,
69 +        FILE *fp)
70 + {
71 +        const char      *s = (const char *)p;
72 +        int             nbytes = elsiz*nel;
73 +
74 +        if (nbytes > 256)
75 +                return(fwrite(p, elsiz, nel, fp));
76 +        
77 +        while (nbytes-- > 0)
78 +                putc(*s++, fp);
79 +
80 +        return(nel);
81 + }
82 +
83 +
84   char *
85 < getstr(s, fp)                   /* get null-terminated string */
86 < char  *s;
87 < register FILE  *fp;
85 > getstr(                         /* get null-terminated string */
86 >        char  *s,
87 >        FILE  *fp
88 > )
89   {
90 <        register char  *cp;
91 <        register int  c;
90 >        char  *cp;
91 >        int  c;
92  
93          cp = s;
94          while ((c = getc(fp)) != EOF)
# Line 126 | Line 100 | register FILE  *fp;
100  
101  
102   long
103 < getint(siz, fp)                 /* get a siz-byte integer */
104 < int  siz;
105 < register FILE  *fp;
103 > getint(                         /* get a siz-byte integer */
104 >        int  siz,
105 >        FILE  *fp
106 > )
107   {
108 <        register int  c;
109 <        register long  r;
108 >        int  c;
109 >        long  r;
110  
111          if ((c = getc(fp)) == EOF)
112                  return(EOF);
# Line 147 | Line 122 | register FILE  *fp;
122  
123  
124   double
125 < getflt(fp)                      /* get a floating point number */
126 < FILE  *fp;
125 > getflt(                         /* get a floating point number */
126 >        FILE  *fp
127 > )
128   {
129          long    l;
130          double  d;
131  
132          l = getint(4, fp);
133 +        if (l == EOF && feof(fp))       /* EOF? */
134 +                return((double)EOF);
135 +        if (l == 0) {
136 +                getc(fp);               /* exactly zero -- ignore exponent */
137 +                return(0.0);
138 +        }
139          d = (l + (l > 0 ? .5 : -.5)) * (1./0x7fffffff);
140          return(ldexp(d, (int)getint(1, fp)));
141 + }
142 +
143 +
144 + int
145 + getbinary(                      /* fread() replacement for small objects */
146 +        void *p,
147 +        int elsiz,
148 +        int nel,
149 +        FILE *fp)
150 + {
151 +        char    *s = (char *)p;
152 +        int     nbytes = elsiz*nel;
153 +        int     c;
154 +
155 +        if (nbytes > 256)
156 +                return(fread(p, elsiz, nel, fp));
157 +        
158 +        while (nbytes-- > 0) {
159 +                if ((c = getc(fp)) == EOF)
160 +                        return((elsiz*nel - nbytes)/elsiz);
161 +                *s++ = c;
162 +        }
163 +        return(nel);
164   }

Diff Legend

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