--- ray/src/util/ranimate.c 2008/11/10 19:08:20 2.54 +++ ray/src/util/ranimate.c 2023/06/10 15:49:55 2.58 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: ranimate.c,v 2.54 2008/11/10 19:08:20 greg Exp $"; +static const char RCSid[] = "$Id: ranimate.c,v 2.58 2023/06/10 15:49:55 greg Exp $"; #endif /* * Radiance animation control program @@ -67,28 +67,28 @@ int NVARS = 24; /* total number of variables */ VARIABLE vv[] = { /* variable-value pairs */ {"ANIMATE", 2, 0, NULL, onevalue}, {"ARCHIVE", 2, 0, NULL, onevalue}, - {"BASENAME", 3, 0, NULL, onevalue}, + {"BASENAME", 3, 0, NULL, strvalue}, {"DBLUR", 2, 0, NULL, onevalue}, - {"DIRECTORY", 3, 0, NULL, onevalue}, + {"DIRECTORY", 3, 0, NULL, strvalue}, {"DISKSPACE", 3, 0, NULL, fltvalue}, {"END", 2, 0, NULL, intvalue}, {"EXPOSURE", 3, 0, NULL, onevalue}, {"host", 4, 0, NULL, NULL}, {"INTERPOLATE", 3, 0, NULL, intvalue}, {"MBLUR", 2, 0, NULL, onevalue}, - {"NEXTANIM", 3, 0, NULL, onevalue}, - {"OCTREE", 3, 0, NULL, onevalue}, + {"NEXTANIM", 3, 0, NULL, strvalue}, + {"OCTREE", 3, 0, NULL, strvalue}, {"OVERSAMPLE", 2, 0, NULL, fltvalue}, {"pfilt", 2, 0, NULL, catvalues}, {"pinterp", 2, 0, NULL, catvalues}, {"render", 3, 0, NULL, catvalues}, {"RESOLUTION", 3, 0, NULL, onevalue}, - {"RIF", 3, 0, NULL, onevalue}, + {"RIF", 3, 0, NULL, strvalue}, {"RSH", 3, 0, NULL, onevalue}, {"RTRACE", 2, 0, NULL, boolvalue}, {"START", 2, 0, NULL, intvalue}, {"TRANSFER", 2, 0, NULL, onevalue}, - {"VIEWFILE", 2, 0, NULL, onevalue}, + {"VIEWFILE", 2, 0, NULL, strvalue}, }; #define SFNAME "STATUS" /* status file name */ @@ -416,9 +416,9 @@ setdefaults(void) /* set default values */ if (!vdef(DISKSPACE)) { if (!nowarn) fprintf(stderr, - "%s: warning - no %s setting, assuming 100 Mbytes available\n", + "%s: warning - no %s setting, assuming 1000 Mbytes available\n", progname, vnam(DISKSPACE)); - vval(DISKSPACE) = "100"; + vval(DISKSPACE) = "1000"; vdef(DISKSPACE)++; } if (!vdef(RSH)) { @@ -1412,7 +1412,7 @@ static int rmfile(char *fn) /* remove a file */ { if (!silent) -#ifdef _WIN32 +#if defined(_WIN32) || defined(_WIN64) printf("\tdel %s\n", fn); #else printf("\trm -f %s\n", fn); @@ -1465,7 +1465,7 @@ getblur(double *mbf, double *dbf) /* get # blur sample int nmblur, ndblur; char *s; /* get motion blur */ - if (!vdef(MBLUR) || (mblurf = atof(vval(MBLUR))) < 0.0) + if (vdef(ANIMATE) || !vdef(MBLUR) || (mblurf = atof(vval(MBLUR))) < 0.0) mblurf = 0.0; if (mbf != NULL) *mbf = mblurf;