cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support 16-bit images as per bug

Browse Source 
http://bugzilla.remotesensing.org/show_bug.cgi?id=1566
Patch from William Bader.
This commit is contained in:
Andrey Kiselev 2007-07-03 16:00:53 +00:00
parent ede042221b
commit bf903e0588
1 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tools/tiff2ps.c
View File

@ -1,4 +1,4 @@
/* $Id: tiff2ps.c,v 1.35 2006-02-23 14:50:32 dron Exp $ */
/* $Id: tiff2ps.c,v 1.36 2007-07-03 16:00:53 dron Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@ -350,6 +350,7 @@ checkImage(TIFF* tif)
switch (bitspersample) {
case 1: case 2:
case 4: case 8:
case 16:
break;
default:
TIFFError(filename, "Can not handle %d-bit/sample image",
@ -434,6 +435,10 @@ setupPageState(TIFF* tif, uint32* pw, uint32* ph, double* pprw, double* pprh)
break;
case RESUNIT_NONE:
default:
/*
* check that the resolution is not inches before scaling it
*/
if (xres != PS_UNIT_SIZE || yres != PS_UNIT_SIZE)
xres *= PS_UNIT_SIZE, yres *= PS_UNIT_SIZE;
break;
}
@ -1173,6 +1178,26 @@ PS_Lvl2ImageDict(FILE* fd, TIFF* tif, uint32 w, uint32 h)
return(use_rawdata);
}
/* Flip the byte order of buffers with 16 bit samples */
static void
PS_FlipBytes(unsigned char* buf, int count)
{
int i;
unsigned char temp;
if (count <= 0 || bitspersample <= 8) {
return;
}
count--;
for (i = 0; i < count; i += 2) {
temp = buf[i];
buf[i] = buf[i + 1];
buf[i + 1] = temp;
}
}
#define MAXLINE 36
int
@ -1278,6 +1303,13 @@ PS_Lvl2page(FILE* fd, TIFF* tif, uint32 w, uint32 h)
if (ascii85)
Ascii85Put('\0', fd);
}
/*
* for 16 bits, the two bytes must be most significant
* byte first
*/
if (bitspersample == 16 && !TIFFIsBigEndian(tif)) {
PS_FlipBytes(buf_data, byte_count);
}
/*
* For images with alpha, matte against a white background;
* i.e. Cback * (1 - Aimage) where Cback = 1. We will fill the
@ -1476,6 +1508,13 @@ PSDataColorContig(FILE* fd, TIFF* tif, uint32 w, uint32 h, int nc)
if (TIFFReadScanline(tif, tf_buf, row, 0) < 0)
break;
cp = tf_buf;
/*
* for 16 bits, the two bytes must be most significant
* byte first
*/
if (bitspersample == 16 && !HOST_BIGENDIAN) {
PS_FlipBytes(cp, tf_bytesperrow);
}
if (alpha) {
int adjust;
cc = 0;
@ -1677,6 +1716,13 @@ PSDataBW(FILE* fd, TIFF* tif, uint32 w, uint32 h)
*cp = ~*cp;
cp++;
}
/*
* for 16 bits, the two bytes must be most significant
* byte first
*/
if (bitspersample == 16 && !HOST_BIGENDIAN) {
PS_FlipBytes(cp, cc);
}
if (ascii85) {
#if defined( EXP_ASCII85ENCODER )
if (alpha) {