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.14 by greg, Sat Dec 23 17:27:45 2006 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
15 < extern double  frexp();
14 > #include <math.h>
15 >
16 > #ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
17 > #undef getc
18 > #undef putc
19 > #define getc    getc_unlocked
20 > #define putc    putc_unlocked
21   #endif
72 #ifndef ldexp
73 extern double  ldexp();
74 #endif
22  
23  
24   void
# Line 101 | Line 48 | putflt(f, fp)                  /* put out floating point number */
48   double  f;
49   FILE  *fp;
50   {
51 +        long  m;
52          int  e;
53  
54 <        putint((long)(frexp(f,&e)*0x7fffffff), 4, fp);
54 >        m = frexp(f, &e) * 0x7fffffff;
55 >        if (e > 127) {                  /* overflow */
56 >                m = m > 0 ? (long)0x7fffffff : -(long)0x7fffffff;
57 >                e = 127;
58 >        } else if (e < -128) {          /* underflow */
59 >                m = 0;
60 >                e = 0;
61 >        }
62 >        putint(m, 4, fp);
63          putint((long)e, 1, fp);
64   }
65  
# Line 154 | Line 110 | FILE  *fp;
110          double  d;
111  
112          l = getint(4, fp);
113 +        if (l == 0) {
114 +                getc(fp);               /* exactly zero -- ignore exponent */
115 +                return(0.0);
116 +        }
117          d = (l + (l > 0 ? .5 : -.5)) * (1./0x7fffffff);
118          return(ldexp(d, (int)getint(1, fp)));
119   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines