--- ray/src/rt/rcmain.c 2022/10/19 23:10:34 2.23 +++ ray/src/rt/rcmain.c 2023/08/15 00:46:56 2.31 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rcmain.c,v 2.23 2022/10/19 23:10:34 greg Exp $"; +static const char RCSid[] = "$Id: rcmain.c,v 2.31 2023/08/15 00:46:56 greg Exp $"; #endif /* * rcmain.c - main for rtcontrib ray contribution tracer @@ -55,13 +55,17 @@ char RCCONTEXT[] = "RC."; /* our special evaluation c #if defined(_WIN32) || defined(_WIN64) #define RCONTRIB_FEATURES "Accumulation\nSummation\nRecovery\n" \ - "ValueContribution\nImmediateIrradiance\n" \ - "ProgressReporting\nDistanceLimiting\n" + "ImmediateIrradiance\n" \ + "ProgressReporting\nDistanceLimiting\n" \ + "InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \ + "Outputs=V,W\n" #else #define RCONTRIB_FEATURES "Multiprocessing\n" \ "Accumulation\nSummation\nRecovery\n" \ - "ValueContribution\nImmediateIrradiance\n" \ - "ProgressReporting\nDistanceLimiting\n" + "ImmediateIrradiance\n" \ + "ProgressReporting\nDistanceLimiting\n" \ + "InputFormats=a,f,d\nOutputFormats=a,f,d,c\n" \ + "Outputs=V,W\n" #endif static void @@ -195,10 +199,12 @@ main(int argc, char *argv[]) gargc = argc; /* feature check only? */ strcat(RFeatureList, RCONTRIB_FEATURES); - if (!strcmp(argv[1], "-features")) + if (argc > 1 && !strcmp(argv[1], "-features")) return feature_status(argc-2, argv+2); -#if defined(_WIN32) || defined(_WIN64) - _setmaxstdio(2048); /* increase file limit to maximum */ +#if defined(_WIN32) || defined(_WIN64) /* increase file limit to maximum */ + for (i = 8192; i > _IOB_ENTRIES; i >>= 1) + if (_setmaxstdio(i) == i) + break; #endif /* initialize calcomp routines early */ initfunc(); @@ -400,7 +406,7 @@ badopt: void wputs( /* warning output function */ - char *s + const char *s ) { int lasterrno = errno; @@ -411,7 +417,7 @@ wputs( /* warning output function */ void eputs( /* put string to stderr */ - char *s + const char *s ) { static int midline = 0;