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

Comparing ray/src/common/image.c (file contents):
Revision 2.17 by greg, Tue Feb 25 02:47:21 2003 UTC vs.
Revision 2.22 by schorsch, Fri Nov 14 17:22:06 2003 UTC

# Line 9 | Line 9 | static const char      RCSid[] = "$Id$";
9  
10   #include "copyright.h"
11  
12 < #include  "standard.h"
13 <
12 > #include  "rtio.h"
13   #include  "view.h"
14  
16 – #include  "paths.h"
15  
16   #define  FEQ(x,y)       (fabs((x)-(y)) <= FTINY)
17   #define  VEQ(v,w)       (FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \
# Line 271 | Line 269 | FVECT  p;
269  
270   void
271   pix2loc(loc, rp, px, py)        /* compute image location from pixel pos. */
272 < FLOAT  loc[2];
272 > RREAL  loc[2];
273   register RESOLU  *rp;
274   int  px, py;
275   {
# Line 394 | Line 392 | register char  *s;
392          int  na;
393          int  nvopts = 0;
394  
395 +        while (*s == ' ')
396 +                s++;
397          if (*s != '-')
398                  s = sskip2(s,1);
399          while (*s) {
400                  ac = 0;
401                  do {
402 <                        av[ac++] = s;
402 >                        if (ac || *s == '-')
403 >                                av[ac++] = s;
404                          while (*s && *s != ' ')
405                                  s++;
406                          while (*s == ' ')

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)