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

Comparing ray/src/util/rmatrix.c (file contents):
Revision 2.8 by greg, Wed Aug 27 13:33:47 2014 UTC vs.
Revision 2.10 by greg, Thu Sep 18 23:20:12 2014 UTC

# Line 356 | Line 356 | rmx_write_rgbe(const RMATRIX *rm, FILE *fp)
356   }
357  
358   /* Write matrix to file type indicated by dtype */
359 < long
359 > int
360   rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
361   {
362          RMATRIX *mydm = NULL;
# Line 371 | Line 371 | rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
371                  dtype = rm->dtype;
372          else if ((dtype == DTrgbe) & (rm->dtype == DTxyze))
373                  dtype = DTxyze;
374 <        else if ((dtype = DTxyze) & (rm->dtype == DTrgbe))
374 >        else if ((dtype == DTxyze) & (rm->dtype == DTrgbe))
375                  dtype = DTrgbe;
376          if ((dtype != DTrgbe) & (dtype != DTxyze)) {
377                  fprintf(fp, "NROWS=%d\n", rm->nrows);
# Line 409 | Line 409 | rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
409          }
410          ok &= (fflush(fp) == 0);
411          rmx_free(mydm);
412 <        return(ftell(fp) * ok);         /* return # bytes written */
412 >        return(ok);
413   }
414  
415   /* Allocate and assign square identity matrix with n components */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines