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

Comparing ray/src/util/rmatrix.c (file contents):
Revision 2.13 by greg, Mon May 4 20:53:21 2015 UTC vs.
Revision 2.15 by greg, Fri May 8 18:25:03 2015 UTC

# Line 10 | Line 10 | static const char RCSid[] = "$Id$";
10   #include <string.h>
11   #include <fcntl.h>
12   #include "resolu.h"
13 + #include "rtprocess.h"
14   #include "rmatrix.h"
15  
16   static char     rmx_mismatch_warn[] = "WARNING: data type mismatch\n";
# Line 46 | Line 47 | rmx_free(RMATRIX *rm)
47   int
48   rmx_newtype(int dtyp1, int dtyp2)
49   {
50 <        if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) && dtyp1 != dtyp2)
50 >        if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) |
51 >                        (dtyp2==DTxyze) | (dtyp2==DTrgbe)
52 >                        && dtyp1 != dtyp2)
53                  return(0);
54          if (dtyp1 < dtyp2)
55                  return(dtyp1);

Diff Legend

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