36 |
|
int wrongformat = 0; /* wrong input format? */ |
37 |
|
double gamcor = 1.0; /* gamma correction */ |
38 |
|
|
39 |
+ |
RGBPRIMP outprims = stdprims; /* output primaries for reverse conversion */ |
40 |
+ |
RGBPRIMS myprims; |
41 |
+ |
|
42 |
|
int ord[3] = {RED, GRN, BLU}; /* RGB ordering */ |
43 |
|
int rord[4]; /* reverse ordering */ |
44 |
|
|
149 |
|
case 'b': /* brightness values */ |
150 |
|
putprim = argv[i][0] == '-' ? BRIGHT : ALL; |
151 |
|
break; |
152 |
< |
case 'p': /* put primary */ |
152 |
> |
case 'p': /* primary controls */ |
153 |
|
switch (argv[i][2]) { |
154 |
+ |
/* these two options affect -r conversion */ |
155 |
+ |
case '\0': |
156 |
+ |
myprims[RED][CIEX] = atof(argv[++i]); |
157 |
+ |
myprims[RED][CIEY] = atof(argv[++i]); |
158 |
+ |
myprims[GRN][CIEX] = atof(argv[++i]); |
159 |
+ |
myprims[GRN][CIEY] = atof(argv[++i]); |
160 |
+ |
myprims[BLU][CIEX] = atof(argv[++i]); |
161 |
+ |
myprims[BLU][CIEY] = atof(argv[++i]); |
162 |
+ |
myprims[WHT][CIEX] = atof(argv[++i]); |
163 |
+ |
myprims[WHT][CIEY] = atof(argv[++i]); |
164 |
+ |
outprims = myprims; |
165 |
+ |
break; |
166 |
+ |
case 'x': case 'X': outprims = NULL; break; |
167 |
+ |
/* the following options affect +r only */ |
168 |
|
case 'r': case 'R': putprim = RED; break; |
169 |
|
case 'g': case 'G': putprim = GRN; break; |
170 |
|
case 'b': case 'B': putprim = BLU; break; |
339 |
|
printargs(i, argv, stdout); |
340 |
|
if (expval < .99 || expval > 1.01) |
341 |
|
fputexpos(expval, stdout); |
342 |
< |
fputformat(COLRFMT, stdout); |
342 |
> |
if (outprims != NULL) { |
343 |
> |
if (outprims != stdprims) |
344 |
> |
fputprims(outprims, stdout); |
345 |
> |
fputformat(COLRFMT, stdout); |
346 |
> |
} else /* XYZ data */ |
347 |
> |
fputformat(CIEFMT, stdout); |
348 |
|
putchar('\n'); |
349 |
|
fputsresolu(&picres, stdout); /* always put resolution */ |
350 |
|
valtopix(); |