diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/ifarp.c | 4 | ||||
| -rw-r--r-- | target/ifarp.h | 5 | ||||
| -rw-r--r-- | target/printtarg.c | 14 | ||||
| -rw-r--r-- | target/targen.c | 2 |
4 files changed, 15 insertions, 10 deletions
diff --git a/target/ifarp.c b/target/ifarp.c index 544f316..03fc914 100644 --- a/target/ifarp.c +++ b/target/ifarp.c @@ -310,6 +310,7 @@ ifarp_del(ifarp *s) { /* Constructor */ ifarp *new_ifarp( +int verb, /* Verbosity */ int di, /* Dimensionality of device space */ double ilimit, /* Ink limit (sum of device coords max) */ int inp, /* Number of points to generate */ @@ -320,7 +321,6 @@ void *od /* context for Perceptual function */ ) { ifarp *s; int e, i; - int verb = 1; #ifdef DEBUG printf("new_ifarp called with di %d, inp %d, fxno = %d\n",di,inp,fxno); @@ -855,7 +855,7 @@ char *argv[]; error ("Creation of xcolorant lu object failed"); /* Create the required points */ - s = new_ifarp(di, 1.5, npoints, NULL, 0, sa_percept, (void *)NULL); + s = new_ifarp(1, di, 1.5, npoints, NULL, 0, sa_percept, (void *)NULL); #ifdef DEBUG /* Dump perceptual map */ diff --git a/target/ifarp.h b/target/ifarp.h index 083411b..ee18840 100644 --- a/target/ifarp.h +++ b/target/ifarp.h @@ -59,9 +59,10 @@ struct _ifarp { }; typedef struct _ifarp ifarp; /* Constructor */ -extern ifarp *new_ifarp(int di, double ilimit, int npoints, +extern ifarp *new_ifarp(int verb, int di, double ilimit, int npoints, fxpos *fxlist, int fxno, - void (*percept)(void *od, double *out, double *in), void *od); + void (*percept)(void *od, double *out, double *in), void *od +); #define IFARP_H #endif /* IFARP_H */ diff --git a/target/printtarg.c b/target/printtarg.c index 863537f..1b03b3c 100644 --- a/target/printtarg.c +++ b/target/printtarg.c @@ -2912,8 +2912,8 @@ void usage(char *diag, ...) { fprintf(stderr," -b Force B&W spacers\n"); fprintf(stderr," -n Force no spacers\n"); fprintf(stderr," -f Create PostScript DeviceN Color fallback\n"); - fprintf(stderr," -w g|r|s|n White colorspace encoding DeviceGray (def), DeviceRGB, Separation or DeviceN\n"); - fprintf(stderr," -k g|c|s|n Black colorspace encoding DeviceGray (def), DeviceCMYK, Separation or DeviceN\n"); + fprintf(stderr," -w g|r|s|n White colorspace encoding: DeviceGray (def), DeviceRGB, Separation or DeviceN\n"); + fprintf(stderr," -k g|c|s|n Black colorspace encoding: DeviceGray (def), DeviceCMYK, Separation or DeviceN\n"); fprintf(stderr," -o k|r|n CMY colorspace encoding DeviceCMYK (def), inverted DeviceRGB or DeviceN\n"); fprintf(stderr," -e Output EPS compatible file\n"); fprintf(stderr," -t [res] Output 8 bit TIFF raster file, optional res DPI (default 100)\n"); @@ -3645,12 +3645,16 @@ char *argv[]; } } - if (verb) { - if (pap != NULL) + if (pap != NULL) { + sprintf(buf, "%.1fx%.1f",pap->w, pap->h); + if (verb) printf("Paper chosen is %s [%.1f x %.1f mm]\n", pap->name, pap->w, pap->h); - else + } else { + sprintf(buf, "%.1fx%.1f",cwidth, cheight); + if (verb) printf("Paper chosen is custom %.1f x %.1f mm\n", cwidth, cheight); } + ocg->add_kword(ocg, 0, "PAPER_SIZE", buf, NULL); if (rstart == -1) { rstart = clk % npat; diff --git a/target/targen.c b/target/targen.c index 4d1d7ac..a29ef63 100644 --- a/target/targen.c +++ b/target/targen.c @@ -2165,7 +2165,7 @@ int main(int argc, char *argv[]) { /* for some of these (new_prand). */ if (uselat) { /* A "greedy"/incremental far point approach */ - t = new_ifarp(di, uilimit, fsteps, fxlist, fxno, + t = new_ifarp(verb, di, uilimit, fsteps, fxlist, fxno, (void(*)(void *, double *, double *))pdata->dev_to_perc, (void *)pdata); sprintf(buf,"%d",fsteps - fxno); pp->add_kword(pp, 0, "IFP_PATCHES", buf, NULL); |