| 447 |
|
register int *rp; |
| 448 |
|
|
| 449 |
|
if (v1->class == v2->class) { |
| 450 |
< |
if (v1->class == TrueColor || v1->class == DirectColor) { |
| 451 |
< |
/* prefer 24-bit to 32-bit */ |
| 452 |
< |
if (v1->depth == 24 && v2->depth == 32) |
| 450 |
> |
if ((v1->class == TrueColor) | (v1->class == DirectColor)) { |
| 451 |
> |
/* prefer 24-bit */ |
| 452 |
> |
if ((v1->depth == 24) & (v2->depth > 24)) |
| 453 |
|
return(-1); |
| 454 |
< |
if (v1->depth == 32 && v2->depth == 24) |
| 454 |
> |
if ((v1->depth > 24) & (v2->depth == 24)) |
| 455 |
|
return(1); |
| 456 |
|
/* go for maximum depth otherwise */ |
| 457 |
|
return(v2->depth - v1->depth); |
| 458 |
|
} |
| 459 |
|
/* don't be too greedy */ |
| 460 |
< |
if (maxcolors <= 1<<v1->depth && maxcolors <= 1<<v2->depth) |
| 460 |
> |
if ((maxcolors <= 1<<v1->depth) & (maxcolors <= 1<<v2->depth)) |
| 461 |
|
return(v1->depth - v2->depth); |
| 462 |
|
return(v2->depth - v1->depth); |
| 463 |
|
} |
| 464 |
|
/* prefer Pseudo when < 15-bit */ |
| 465 |
< |
if ((v1->class == TrueColor || v1->class == DirectColor) && |
| 465 |
> |
if ((v1->class == TrueColor) | (v1->class == DirectColor) && |
| 466 |
|
v1->depth < 15) |
| 467 |
|
bad1 = 1; |
| 468 |
< |
if ((v2->class == TrueColor || v2->class == DirectColor) && |
| 468 |
> |
if ((v2->class == TrueColor) | (v2->class == DirectColor) && |
| 469 |
|
v2->depth < 15) |
| 470 |
|
bad2 = -1; |
| 471 |
|
if (bad1 | bad2) |
