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

Comparing ray/src/util/pvsum.c (file contents):
Revision 2.3 by greg, Fri Mar 28 21:36:31 2025 UTC vs.
Revision 2.6 by greg, Sat Jun 28 17:30:50 2025 UTC

# Line 15 | Line 15 | static const char RCSid[] = "$Id$";
15   #include "rmatrix.h"
16   #if !defined(_WIN32) && !defined(_WIN64)
17   #include <sys/mman.h>
18 + #include <sys/wait.h>
19   #endif
20  
21   int     nprocs = 1;                     /* # of calculation processes (Unix) */
# Line 471 | Line 472 | multi_process(void)
472                                  return(0);
473                          }
474                          i = in_type==DTfloat ? ncomp*(int)sizeof(float) : ncomp+1;
475 <                        maplen = dstart + yres*xres*i;
475 >                        maplen = dstart + (size_t)yres*xres*i;
476                          imap = mmap(NULL, maplen, PROT_READ,
477                                          MAP_FILE|MAP_SHARED, fileno(finp), 0);
478                          fclose(finp);           /* will read from map (randomly) */
# Line 577 | Line 578 | badopt:                        fprintf(stderr, "%s: bad option: %s\n", argv
578          if ((argc-a < 1) | (argc-a > 2) || argv[a][0] == '-')
579                  goto userr;
580          in_spec = argv[a];
581 <        cmtx = rmx_load(argv[a+1], RMPnone);    /* loads from stdin if a+1==argc */
581 >        cmtx = rmx_load(argv[a+1]);     /* loads from stdin if a+1==argc */
582          if (cmtx == NULL)
583                  return(1);              /* error reported */
584          if (nprocs > cmtx->ncols)

Diff Legend

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