[ViewVC] Diff of: Development/ray/src/util/rcollate.c

Comparing ray/src/util/rcollate.c (file contents):
Revision 2.2 by greg, Thu Sep 5 18:30:58 2013 UTC vs.
Revision 2.3 by greg, Thu Sep 5 18:47:12 2013 UTC

+                if (ni_columns <= 0)
+                        ni_columns = count_columns(rp);
+                nrecords = rp->nrecs;
-<
+        } else if ((ni_rows > 0) & (ni_columns > 0))
->
+        } else if ((ni_rows > 0) & (ni_columns > 0)) {
+                nrecords = ni_rows*ni_columns;
-<
+        else
->
+                if (nrecords > mp->len / -record_width) {
->
+                        fprintf(stderr,
->
+                            "Input too small for specified size and type\n");
->
+                        return(0);
->
+                }
->
+        } else
+                nrecords = mp->len / -record_width;
+                                                /* check sizes */
+        if (ni_rows <= 0)

-–
+Removed lines
-+
+Added lines
-<
+Changed lines (old)
->
+Changed lines (new)