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.31 by greg, Fri Nov 8 02:10:38 2019 UTC vs.
Revision 2.32 by greg, Fri Nov 8 05:39:05 2019 UTC

# Line 394 | Line 394 | get_input_pos(int r, int c)
394          } else if (transpose)           /* transpose only */
395                  n = (long)c*ni_columns + r;
396          else                            /* XXX should never happen! */
397 <                n = (long)r*ni_columns + c;
397 >                n = (long)r*no_columns + c;
398          return(n);
399   }
400  
# Line 440 | Line 440 | do_reorder(const MEMLOAD *mp)
440                  if (no_rows <= 0)
441                          no_rows = ni_columns;
442                  if ((no_rows != ni_columns) | (no_columns != ni_rows))
443 –                        goto badspec;
444 –        } else {
445 –                if (no_columns <= 0)
446 –                        no_columns = ni_columns;
447 –                if (no_rows <= 0)
448 –                        no_rows = ni_rows;
449 –                if ((no_rows != ni_rows) | (no_columns != ni_columns))
443                          goto badspec;
444          }
445                                                  /* reorder records */

Diff Legend

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