15 |
|
|
16 |
|
#include "copyright.h" |
17 |
|
|
18 |
– |
#include "standard.h" |
18 |
|
#include <ctype.h> |
19 |
|
#include <sys/stat.h> |
20 |
+ |
|
21 |
+ |
#include "standard.h" |
22 |
+ |
#include "paths.h" |
23 |
|
#include "view.h" |
24 |
|
#include "vars.h" |
25 |
|
#include "netproc.h" |
28 |
|
#define DEF_NBLUR 5 |
29 |
|
#endif |
30 |
|
/* default remote shell */ |
29 |
– |
#ifdef _AUX_SOURCE |
30 |
– |
#define REMSH "remsh" |
31 |
– |
#else |
31 |
|
#define REMSH "rsh" |
33 |
– |
#endif |
32 |
|
/* input variables (alphabetical by name) */ |
33 |
|
#define ANIMATE 0 /* animation command */ |
34 |
|
#define ARCHIVE 1 /* archiving command */ |
478 |
|
pippt = NULL; |
479 |
|
} |
480 |
|
if (pippt != NULL) |
481 |
< |
strcpy(pippt, "> /dev/null"); /* nothing to match */ |
481 |
> |
strcpy(pippt, "> " NULL_DEVICE); /* nothing to match */ |
482 |
|
else { |
483 |
|
sprintf(cp, ")[ \t]*=' > %s/radset.var", vval(DIRECTORY)); |
484 |
|
cp += 11; /* point to file name */ |
627 |
|
if (astat.tnext < astat.fnext) /* other work to do first */ |
628 |
|
return; |
629 |
|
/* filter each view */ |
630 |
< |
for (i = astat.fnext; i < astat.rnext; i++) { |
631 |
< |
if ((vp = getview(i)) == NULL) { /* get view i */ |
632 |
< |
fprintf(stderr, |
635 |
< |
"%s: unexpected error reading view for frame %d\n", |
636 |
< |
progname, i); |
637 |
< |
quit(1); |
638 |
< |
} |
639 |
< |
dofilt(i, vp, getexp(i), 0); /* filter frame */ |
640 |
< |
} |
630 |
> |
for (i = astat.fnext; i < astat.rnext; i++) |
631 |
> |
dofilt(i, 0); |
632 |
> |
|
633 |
|
bwait(0); /* wait for filter processes */ |
634 |
|
archive(); /* archive originals */ |
635 |
|
astat.fnext = i; /* update status */ |
806 |
|
frecover(frame) /* recover filtered frame */ |
807 |
|
int frame; |
808 |
|
{ |
809 |
< |
VIEW *vp; |
818 |
< |
char *ex; |
819 |
< |
|
820 |
< |
vp = getview(frame); |
821 |
< |
ex = getexp(frame); |
822 |
< |
if (dofilt(frame, vp, ex, 2) && dofilt(frame, vp, ex, 1)) |
809 |
> |
if (dofilt(frame, 2) && dofilt(frame, 1)) |
810 |
|
return(1); |
811 |
|
return(0); |
812 |
|
} |
856 |
|
|
857 |
|
|
858 |
|
int |
859 |
< |
dofilt(frame, vp, ep, rvr) /* filter frame */ |
859 |
> |
dofilt(frame, rvr) /* filter frame */ |
860 |
|
int frame; |
874 |
– |
VIEW *vp; |
875 |
– |
char *ep; |
861 |
|
int rvr; |
862 |
|
{ |
863 |
|
extern int frecover(); |
864 |
|
static int iter = 0; |
865 |
|
double blurf; |
866 |
|
int nblur = getblur(&blurf); |
867 |
+ |
VIEW *vp = getview(frame); |
868 |
+ |
char *ep = getexp(frame); |
869 |
|
char fnbefore[128], fnafter[128], *fbase; |
870 |
|
char combuf[1024], fname0[128], fname1[128]; |
871 |
|
int usepinterp, usepfilt, nora_rgbe; |
872 |
|
int frseq[2]; |
873 |
|
/* check what is needed */ |
874 |
+ |
if (vp == NULL) { |
875 |
+ |
fprintf(stderr, |
876 |
+ |
"%s: unexpected error reading view for frame %d\n", |
877 |
+ |
progname, frame); |
878 |
+ |
quit(1); |
879 |
+ |
} |
880 |
+ |
if (ep == NULL) { |
881 |
+ |
fprintf(stderr, |
882 |
+ |
"%s: unexpected error reading exposure for frame %d\n", |
883 |
+ |
progname, frame); |
884 |
+ |
quit(1); |
885 |
+ |
} |
886 |
|
usepinterp = (nblur > 1); |
887 |
< |
usepfilt = pfiltalways | ep==NULL; |
887 |
> |
usepfilt = pfiltalways | (ep==NULL); |
888 |
|
if (ep != NULL && !strcmp(ep, "1")) |
889 |
|
ep = "+0"; |
890 |
|
nora_rgbe = strcmp(vval(OVERSAMP),"1") || ep==NULL || |
1031 |
|
fclose(viewfp); |
1032 |
|
viewfp = NULL; |
1033 |
|
viewnum = 0; |
1034 |
< |
copystruct(&curview, &stdview); |
1034 |
> |
curview = stdview; |
1035 |
|
} |
1036 |
|
return(NULL); |
1037 |
|
} |
1047 |
|
perror(vval(VIEWFILE)); |
1048 |
|
quit(1); |
1049 |
|
} |
1050 |
< |
copystruct(&curview, &stdview); |
1050 |
> |
curview = stdview; |
1051 |
|
viewnum = 0; |
1052 |
|
} |
1053 |
|
if (n < 0) { /* get next view */ |
1360 |
|
char *fn; |
1361 |
|
{ |
1362 |
|
if (!silent) |
1363 |
< |
#ifdef MSDOS |
1363 |
> |
#ifdef _WIN32 |
1364 |
|
printf("\tdel %s\n", fn); |
1365 |
|
#else |
1366 |
|
printf("\trm -f %s\n", fn); |
1391 |
|
for (i = 0, psep = -1; path[i]; i++) |
1392 |
|
if (path[i] == '/') |
1393 |
|
psep = i; |
1394 |
< |
if (df != NULL) |
1394 |
> |
if (df != NULL) { |
1395 |
|
if (psep == 0) { |
1396 |
|
df[0] = '/'; |
1397 |
|
df[1] = '\0'; |
1400 |
|
df[psep] = '\0'; |
1401 |
|
} else |
1402 |
|
df[0] = '\0'; |
1403 |
+ |
} |
1404 |
|
return(path+psep+1); |
1405 |
|
} |
1406 |
|
|