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

Comparing ray/src/common/depthcodec.c (file contents):
Revision 2.4 by greg, Wed Aug 14 21:00:14 2019 UTC vs.
Revision 2.8 by greg, Sat Jan 25 05:35:34 2020 UTC

# Line 8 | Line 8 | static const char RCSid[] = "$Id$";
8   #include "copyright.h"
9  
10   #include <stdlib.h>
11 – #include <string.h>
11   #include <math.h>
12   #include <ctype.h>
13   #include "rtio.h"
# Line 27 | Line 26 | depth2code(double d, double dref)
26          if (d > dref)
27                  return (int)(32768.001 - 32768.*dref/d) - 1;
28  
29 <        return (int)(32767.*d/dref - 32768.);
29 >        return (int)(32767.*d/dref - 32768.999);
30   }
31   #endif
32  
# Line 42 | Line 41 | code2depth(int c, double dref)
41  
42          if (c >= 32767)
43                  return FHUGE;
44 <                
45 <        if (c < 0)
46 <                return dref*(32767.5 + c)*(1./32767.);
47 <        
48 <        return dref*32768./(32766.5 - c);
44 >
45 >        if (c >= -1)
46 >                return dref*32768./(32766.5 - c);
47 >
48 >        return dref*(32768.5 + c)*(1./32767.);
49   }
50   #endif
51  
# Line 59 | Line 58 | set_dc_defaults(DEPTHCODEC *dcp)
58          dcp->finp = stdin;
59          dcp->inpname = "<stdin>";
60          dcp->format = 'a';
62 –        dcp->swapped = 0;
61          dcp->refdepth = 1.;
62          dcp->depth_unit[0] = '1';
63          dcp->vw = stdview;
# Line 99 | Line 97 | headline(char *s, void *p)
97                          }
98                          return -1;
99                  }
100 <        } else if (isview(s))           /* get view params */
100 >        } else if (!strncmp(s, "SAMP360=", 8))
101 >                dcp->gotview--;
102 >        else if (isview(s))             /* get view params */
103                  dcp->gotview += (sscanview(&dcp->vw, s) > 0);
104          if (dcp->hdrflags & HF_HEADOUT)
105                  fputs(s, stdout);       /* copy to standard output */
# Line 119 | Line 119 | process_dc_header(DEPTHCODEC *dcp, int ac, char *av[])
119                  }
120                  return 0;
121          }
122 +        dcp->gotview *= (dcp->gotview > 0);
123          if (dcp->hdrflags & HF_HEADOUT) {       /* finish header */
124                  if (!(dcp->hdrflags & HF_HEADIN))
125                          newheader("RADIANCE", stdout);
# Line 224 | Line 225 | check_decode_worldpos(DEPTHCODEC *dcp)
225   double
226   decode_depth_next(DEPTHCODEC *dcp)
227   {
228 <        int     c = getint(2, dcp->finp);
228 >        int     c;
229  
230 +        if (dcp->use_last) {
231 +                dcp->use_last = 0;
232 +                return code2depth(dcp->last_dc, dcp->refdepth);
233 +        }
234 +        c = getint(2, dcp->finp);
235 +
236          if (c == EOF && feof(dcp->finp))
237                  return -1.;
238  
239 +        dcp->last_dc = c;
240          dcp->curpos += 2;
241  
242          return code2depth(c, dcp->refdepth);
# Line 296 | Line 304 | seek_dc_pix(DEPTHCODEC *dcp, int x, int y)
304          }
305          seekpos = dcp->dstart + 2*((long)y*scanlen(&dcp->res) + x);
306  
307 +        if (seekpos == dcp->curpos-2) {
308 +                dcp->use_last++;        /* avoids seek/read */
309 +                return 1;
310 +        }
311          if (seekpos != dcp->curpos &&
312                          fseek(dcp->finp, seekpos, SEEK_SET) == EOF) {
313                  if (dcp->hdrflags & HF_STDERR) {

Diff Legend

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