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

Comparing ray/src/util/rcollate.c (file contents):
Revision 2.4 by greg, Fri Sep 6 21:34:39 2013 UTC vs.
Revision 2.5 by greg, Fri Sep 6 21:43:29 2013 UTC

# Line 274 | Line 274 | do_transpose(const MEMLOAD *mp)
274          RECINDEX                *rp = NULL;
275          long                    nrecords;
276          int                     i, j;
277 +                                                /* propogate sizes */
278 +        if (ni_rows <= 0)
279 +                ni_rows = no_columns;
280 +        if (ni_columns <= 0)
281 +                ni_columns = no_rows;
282                                                  /* get # records (& index) */
283          if (record_width > 0) {
284                  if ((rp = index_records(mp, record_width)) == NULL)
# Line 291 | Line 296 | do_transpose(const MEMLOAD *mp)
296          } else
297                  nrecords = mp->len / -record_width;
298                                                  /* check sizes */
294 –        if (ni_rows <= 0)
295 –                ni_rows = no_columns;
296 –        if (ni_columns <= 0)
297 –                ni_columns = no_rows;
299          if ((ni_rows <= 0) & (ni_columns > 0))
300                  ni_rows = nrecords/ni_columns;
301          if ((ni_columns <= 0) & (ni_rows > 0))

Diff Legend

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