9 |
|
|
10 |
|
#include <ctype.h> |
11 |
|
#include <time.h> |
12 |
+ |
#include <signal.h> |
13 |
|
|
14 |
|
#include "platform.h" |
15 |
|
#include "rtprocess.h" |
645 |
|
for (cp = combuf; *cp; cp++) |
646 |
|
; |
647 |
|
mkpmapopts(cp); |
648 |
+ |
/* force file overwrite */ |
649 |
+ |
cp = addarg(cp, "-fo+"); |
650 |
|
if (vdef(REPORT)) { |
651 |
|
char errfile[256]; |
652 |
|
int n; |
675 |
|
if (runcom(combuf)) { |
676 |
|
fprintf(stderr, "%s: error running %s\n", |
677 |
|
progname, c_mkpmap); |
678 |
< |
if (pgmapname != NULL) |
678 |
> |
if (pgmapname != NULL && pgmapdate < oct1date) |
679 |
|
unlink(pgmapname); |
680 |
< |
if (pcmapname != NULL) |
680 |
> |
if (pcmapname != NULL && pcmapdate < oct1date) |
681 |
|
unlink(pcmapname); |
682 |
|
quit(1); |
683 |
|
} |
806 |
|
{ |
807 |
|
char pmapf[256], *bw; |
808 |
|
|
809 |
+ |
if (vdef(PGMAP)) { |
810 |
+ |
*op = '\0'; |
811 |
+ |
bw = sskip2(vval(PGMAP), 2); |
812 |
+ |
atos(pmapf, sizeof(pmapf), vval(PGMAP)); |
813 |
+ |
op = addarg(addarg(op, "-ap"), pmapf); |
814 |
+ |
if (atoi(bw) > 0) op = addarg(op, bw); |
815 |
+ |
} |
816 |
|
switch(vscale(QUALITY)) { |
817 |
|
case LOW: |
818 |
|
lowqopts(op, po); |
824 |
|
hiqopts(op, po); |
825 |
|
break; |
826 |
|
} |
817 |
– |
if (vdef(PGMAP)) { |
818 |
– |
bw = sskip2(vval(PGMAP), 2); |
819 |
– |
atos(pmapf, sizeof(pmapf), vval(PGMAP)); |
820 |
– |
op = addarg(addarg(op, "-ap"), pmapf); |
821 |
– |
if (atoi(bw) > 0) op = addarg(op, bw); |
822 |
– |
} |
827 |
|
if (vdef(PCMAP)) { |
828 |
|
bw = sskip2(vval(PCMAP), 2); |
829 |
|
atos(pmapf, sizeof(pmapf), vval(PCMAP)); |
833 |
|
if (vdef(RENDER)) |
834 |
|
op = addarg(op, vval(RENDER)); |
835 |
|
if (rvdevice != NULL) { |
836 |
< |
if (vdef(RVU)) |
836 |
> |
if (vdef(RVU)) { |
837 |
|
if (vval(RVU)[0] != '-') { |
838 |
|
atos(c_rvu, sizeof(c_rvu), vval(RVU)); |
839 |
|
po = addarg(po, sskip2(vval(RVU), 1)); |
840 |
|
} else |
841 |
|
po = addarg(po, vval(RVU)); |
842 |
+ |
} |
843 |
|
} else { |
844 |
< |
if (vdef(RPICT)) |
844 |
> |
if (vdef(RPICT)) { |
845 |
|
if (vval(RPICT)[0] != '-') { |
846 |
|
atos(c_rpict, sizeof(c_rpict), vval(RPICT)); |
847 |
|
po = addarg(po, sskip2(vval(RPICT), 1)); |
848 |
|
} else |
849 |
|
po = addarg(po, vval(RPICT)); |
850 |
+ |
} |
851 |
|
} |
852 |
|
} |
853 |
|
|
1148 |
|
po = addarg(po, "-m .25"); |
1149 |
|
break; |
1150 |
|
} |
1151 |
< |
if (vdef(PFILT)) |
1151 |
> |
if (vdef(PFILT)) { |
1152 |
|
if (vval(PFILT)[0] != '-') { |
1153 |
|
atos(c_pfilt, sizeof(c_pfilt), vval(PFILT)); |
1154 |
|
po = addarg(po, sskip2(vval(PFILT), 1)); |
1155 |
|
} else |
1156 |
|
po = addarg(po, vval(PFILT)); |
1157 |
+ |
} |
1158 |
|
} |
1159 |
|
|
1160 |
|
|