| 122 |
|
if (!TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &hi) || hi != 8) |
| 123 |
|
quiterr("unsupported bits per sample"); |
| 124 |
|
if (TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &hi) && |
| 125 |
< |
hi != (nsamps==1 ? 1 : 2)) |
| 125 |
> |
hi != (nsamps==1 ? PHOTOMETRIC_MINISBLACK : |
| 126 |
> |
PHOTOMETRIC_RGB)) |
| 127 |
|
quiterr("unsupported photometric interpretation"); |
| 128 |
|
if (!TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &pconfig) || |
| 129 |
< |
(pconfig != 1 && pconfig != 2)) |
| 129 |
> |
(pconfig != PLANARCONFIG_CONTIG && |
| 130 |
> |
pconfig != PLANARCONFIG_SEPARATE)) |
| 131 |
|
quiterr("unsupported planar configuration"); |
| 132 |
|
if (!TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &xmax) || |
| 133 |
|
!TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &ymax)) |
| 219 |
|
TIFFSetField(tif, TIFFTAG_IMAGELENGTH, (unsigned long)ymax); |
| 220 |
|
TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, greyscale ? 1 : 3); |
| 221 |
|
TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8); |
| 222 |
< |
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, greyscale ? 1 : 2); |
| 223 |
< |
TIFFSetField(tif, TIFFTAG_PLANARCONFIG, 1); |
| 222 |
> |
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, |
| 223 |
> |
greyscale ? PHOTOMETRIC_MINISBLACK : |
| 224 |
> |
PHOTOMETRIC_RGB); |
| 225 |
> |
TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); |
| 226 |
|
if (lzcomp) |
| 227 |
< |
TIFFSetField(tif, TIFFTAG_COMPRESSION, (unsigned short)5); |
| 227 |
> |
TIFFSetField(tif, TIFFTAG_COMPRESSION, |
| 228 |
> |
(unsigned short)COMPRESSION_LZW); |
| 229 |
|
/* allocate scanlines */ |
| 230 |
|
scanin = (COLR *)malloc(xmax*sizeof(COLR)); |
| 231 |
|
scanout = (BYTE *)malloc(TIFFScanlineSize(tif)); |
