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

Comparing ray/src/util/cmatrix.c (file contents):
Revision 2.12 by greg, Wed Jul 22 04:29:56 2015 UTC vs.
Revision 2.14 by greg, Tue Feb 2 18:02:32 2016 UTC

# Line 11 | Line 11 | static const char RCSid[] = "$Id$";
11   #include "standard.h"
12   #include "cmatrix.h"
13   #include "platform.h"
14 < #include "rtprocess.h"
14 > #include "paths.h"
15   #include "resolu.h"
16  
17   const char      *cm_fmt_id[] = {
# Line 221 | Line 221 | cm_load(const char *inspec, int nrows, int ncols, int
221                          cm = cm_resize(cm, 2*cm->nrows);
222                      for (c = 0; c < ncols; c++) {
223                          COLORV  *cv = cm_lval(cm,r,c);
224 <                        if (fscanf(fp, COLSPEC, cv, cv+1, cv+2) != 3)
224 >                        if (fscanf(fp, COLSPEC, cv, cv+1, cv+2) != 3) {
225                                  if ((nrows <= 0) & (r > 0) & !c) {
226                                          cm = cm_resize(cm, maxrow=r);
227                                          break;
228                                  } else
229                                          goto EOFerror;
230 +                        }
231                      }
232                  }
233                  while ((c = getc(fp)) != EOF)

Diff Legend

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