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

Comparing ray/src/px/ra_tiff.c (file contents):
Revision 2.25 by schorsch, Mon Jul 21 22:30:19 2003 UTC vs.
Revision 2.26 by schorsch, Sun Jul 27 22:12:03 2003 UTC

# Line 208 | Line 208 | allocbufs()                    /* allocate scanline buffers */
208                          (CHK(C_GRY) ? 1 : 3);
209          cvts.r.p = (char *)malloc(rsiz*cvts.xmax);
210          cvts.t.p = (char *)malloc(tsiz*cvts.xmax);
211 <        if (cvts.r.p == NULL | cvts.t.p == NULL)
211 >        if ((cvts.r.p == NULL) | (cvts.t.p == NULL))
212                  quiterr("no memory to allocate scanline buffers");
213   }
214  
# Line 660 | Line 660 | void
660   RRGGBB2Color(y)                 /* read/convert/write RGB16->COLOR scanline */
661   uint32  y;
662   {
663 <        int     dogamma = cvts.gamcor < 0.99 | cvts.gamcor > 1.01;
663 >        int     dogamma = (cvts.gamcor < 0.99) | (cvts.gamcor > 1.01);
664          register double d;
665          register int    x;
666  
# Line 807 | Line 807 | void
807   GGry2Color(y)                   /* read/convert/write G16->COLOR scanline */
808   uint32  y;
809   {
810 <        int     dogamma = cvts.gamcor < 0.99 | cvts.gamcor > 1.01;
810 >        int     dogamma = (cvts.gamcor < 0.99) | (cvts.gamcor > 1.01);
811          double  m;
812          register double d;
813          register int    x;
# Line 837 | Line 837 | void
837   Color2GGry(y)                   /* read/convert/write COLOR->G16 scanline */
838   uint32  y;
839   {
840 <        int     dogamma = cvts.gamcor < 0.99 | cvts.gamcor > 1.01;
840 >        int     dogamma = (cvts.gamcor < 0.99) | (cvts.gamcor > 1.01);
841          float   m = pow(2.,(double)cvts.bradj);
842          register int    x;
843  
# Line 926 | Line 926 | void
926   Color2RRGGBB(y)                 /* read/convert/write COLOR->RGB16 scanline */
927   uint32  y;
928   {
929 <        int     dogamma = cvts.gamcor < 0.99 | cvts.gamcor > 1.01;
929 >        int     dogamma = (cvts.gamcor < 0.99) | (cvts.gamcor > 1.01);
930          float   m = pow(2.,(double)cvts.bradj);
931          register int    x, i;
932  

Diff Legend

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