| 279 |
|
normaspect(viewaspect(&ourview)*hmult/vmult, &pixaspect, &hres, &vres); |
| 280 |
|
if (!nowarn && (hr != hres*hmult) | (vr != vres*vmult)) |
| 281 |
|
fprintf(stderr, |
| 282 |
< |
"%s: warning - resolution changed from %dx%d to %dx%d\n", |
| 282 |
> |
"%s: warning - changed resolution from %dx%d to %dx%d\n", |
| 283 |
|
progname, hr, vr, hres*hmult, vres*vmult); |
| 284 |
|
sprintf(hrbuf, "%d", hres); |
| 285 |
|
rpargv[rpargc++] = "-x"; rpargv[rpargc++] = hrbuf; |
| 326 |
|
goto filerr; |
| 327 |
|
dolock(outfd, F_UNLCK); |
| 328 |
|
/* start rpict process */ |
| 329 |
+ |
rpd = sp_inactive; |
| 330 |
|
if (open_process(&rpd, rpargv) <= 0) { |
| 331 |
|
fprintf(stderr, "%s: cannot start %s\n", progname, rpargv[0]); |
| 332 |
|
exit(1); |
| 403 |
|
{ |
| 404 |
|
static char *pdone = NULL; /* which pieces are done */ |
| 405 |
|
static long readpos = -1; /* how far we've read */ |
| 406 |
< |
int i; |
| 406 |
> |
int px, py, i; |
| 407 |
|
/* |
| 408 |
|
* This routine is called by nextpiece() with an |
| 409 |
|
* exclusive lock on syncfp and the file pointer at the |
| 412 |
|
if (rvrlim < 0) |
| 413 |
|
return(0); /* only check if asked */ |
| 414 |
|
if (pdone == NULL) /* first call */ |
| 415 |
< |
pdone = calloc(hmult*vmult, sizeof(char)); |
| 415 |
> |
pdone = (char *)calloc(hmult*vmult, sizeof(char)); |
| 416 |
|
if (pdone == NULL) { |
| 417 |
|
fprintf(stderr, "%s: out of memory\n", progname); |
| 418 |
|
exit(1); |
| 419 |
|
} |
| 420 |
|
if (readpos != -1) /* mark what's been done */ |
| 421 |
|
fseek(syncfp, readpos, 0); |
| 422 |
< |
while (fscanf(syncfp, "%d %d", xp, yp) == 2) |
| 423 |
< |
pdone[*xp*vmult+*yp] = 1; |
| 422 |
> |
while (fscanf(syncfp, "%d %d", &px, &py) == 2) |
| 423 |
> |
pdone[px*vmult+py] = 1; |
| 424 |
|
if (!feof(syncfp)) { |
| 425 |
|
fprintf(stderr, "%s: format error in sync file\n", progname); |
| 426 |
|
exit(1); |
