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

Avoid warnings.

Browse Source
This commit is contained in:
Andrey Kiselev 2004-06-04 14:16:14 +00:00
parent cf7d2a38c4
commit 73e787830f
4 changed files with 66 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
tools/tiff2ps.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiff2ps.c,v 1.21 2003-12-19 15:30:27 dron Exp $ */ /* $Id: tiff2ps.c,v 1.22 2004-06-04 14:16:14 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -109,8 +109,8 @@ int generateEPSF = TRUE; /* generate Encapsulated PostScript */
int PSduplex = FALSE; /* enable duplex printing */ int PSduplex = FALSE; /* enable duplex printing */
int PStumble = FALSE; /* enable top edge binding */ int PStumble = FALSE; /* enable top edge binding */
int PSavoiddeadzone = TRUE; /* enable avoiding printer deadzone */ int PSavoiddeadzone = TRUE; /* enable avoiding printer deadzone */
float maxPageHeight = 0; /* maximum size to fit on page */ double maxPageHeight = 0; /* maximum size to fit on page */
float splitOverlap = 0; /* amount for split pages to overlag */ double splitOverlap = 0; /* amount for split pages to overlag */
int rotate = FALSE; /* rotate image by 180 degrees */ int rotate = FALSE; /* rotate image by 180 degrees */
char *filename; /* input filename */ char *filename; /* input filename */
int useImagemask = FALSE; /* Use imagemask instead of image operator */ int useImagemask = FALSE; /* Use imagemask instead of image operator */
@ -123,7 +123,7 @@ unsigned char ascii85buf[10];
int ascii85count; int ascii85count;
int ascii85breaklen; int ascii85breaklen;
int TIFF2PS(FILE*, TIFF*, float, float, double, double, int); int TIFF2PS(FILE*, TIFF*, double, double, double, double, int);
void PSpage(FILE*, TIFF*, uint32, uint32); void PSpage(FILE*, TIFF*, uint32, uint32);
void PSColorContigPreamble(FILE*, uint32, uint32, int); void PSColorContigPreamble(FILE*, uint32, uint32, int);
void PSColorSeparatePreamble(FILE*, uint32, uint32, int); void PSColorSeparatePreamble(FILE*, uint32, uint32, int);
@ -135,7 +135,7 @@ void PSRawDataBW(FILE*, TIFF*, uint32, uint32);
void Ascii85Init(void); void Ascii85Init(void);
void Ascii85Put(unsigned char code, FILE* fd); void Ascii85Put(unsigned char code, FILE* fd);
void Ascii85Flush(FILE* fd); void Ascii85Flush(FILE* fd);
void PSHead(FILE*, TIFF*, uint32, uint32, float, float, float, float); void PSHead(FILE*, TIFF*, uint32, uint32, double, double, double, double);
void PSTail(FILE*, int); void PSTail(FILE*, int);
#if defined( EXP_ASCII85ENCODER) #if defined( EXP_ASCII85ENCODER)
@ -147,12 +147,13 @@ static void usage(int);
int int
main(int argc, char* argv[]) main(int argc, char* argv[])
{ {
int dirnum = -1, c, np = 0; tdir_t dirnum = -1;
int c, np = 0;
int centered = 0; int centered = 0;
float bottommargin = 0; double bottommargin = 0;
float leftmargin = 0; double leftmargin = 0;
float pageWidth = 0; double pageWidth = 0;
float pageHeight = 0; double pageHeight = 0;
uint32 diroff = 0; uint32 diroff = 0;
extern char *optarg; extern char *optarg;
extern int optind; extern int optind;
@ -402,9 +403,9 @@ PhotoshopBanner(FILE* fd, uint32 w, uint32 h, int bs, int nc, char* startline)
* pprh : image height in PS units (72 dpi) * pprh : image height in PS units (72 dpi)
*/ */
static void static void
setupPageState(TIFF* tif, uint32* pw, uint32* ph, float* pprw, float* pprh) setupPageState(TIFF* tif, uint32* pw, uint32* ph, double* pprw, double* pprh)
{ {
float xres, yres; double xres, yres;
TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, pw); TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, pw);
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, ph); TIFFGetField(tif, TIFFTAG_IMAGELENGTH, ph);
@ -454,19 +455,19 @@ static char *hex = "0123456789abcdef";
* pagewidth & pageheight are inches * pagewidth & pageheight are inches
*/ */
int int
PlaceImage(FILE *fp, float pagewidth, float pageheight, PlaceImage(FILE *fp, double pagewidth, double pageheight,
float imagewidth, float imageheight, int splitpage, double imagewidth, double imageheight, int splitpage,
double lm, double bm, int cnt) double lm, double bm, int cnt)
{ {
float xtran = 0; double xtran = 0;
float ytran = 0; double ytran = 0;
float xscale = 1; double xscale = 1;
float yscale = 1; double yscale = 1;
float left_offset = lm * PS_UNIT_SIZE; double left_offset = lm * PS_UNIT_SIZE;
float bottom_offset = bm * PS_UNIT_SIZE; double bottom_offset = bm * PS_UNIT_SIZE;
float subimageheight; double subimageheight;
float splitheight; double splitheight;
float overlap; double overlap;
pagewidth *= PS_UNIT_SIZE; pagewidth *= PS_UNIT_SIZE;
pageheight *= PS_UNIT_SIZE; pageheight *= PS_UNIT_SIZE;
@ -529,13 +530,14 @@ PlaceImage(FILE *fp, float pagewidth, float pageheight,
/* returns the sequence number of the page processed */ /* returns the sequence number of the page processed */
int int
TIFF2PS(FILE* fd, TIFF* tif, float pw, float ph, double lm, double bm, int cnt) TIFF2PS(FILE* fd, TIFF* tif,
double pw, double ph, double lm, double bm, int cnt)
{ {
uint32 w, h; uint32 w, h;
float ox, oy, prw, prh; double ox, oy, prw, prh;
float scale = 1.0; double scale = 1.0;
float left_offset = lm * PS_UNIT_SIZE; double left_offset = lm * PS_UNIT_SIZE;
float bottom_offset = bm * PS_UNIT_SIZE; double bottom_offset = bm * PS_UNIT_SIZE;
uint32 subfiletype; uint32 subfiletype;
uint16* sampleinfo; uint16* sampleinfo;
static int npages = 0; static int npages = 0;
@ -586,7 +588,7 @@ TIFF2PS(FILE* fd, TIFF* tif, float pw, float ph, double lm, double bm, int cnt)
npages++; npages++;
fprintf(fd, "%%%%Page: %d %d\n", npages, npages); fprintf(fd, "%%%%Page: %d %d\n", npages, npages);
if (!generateEPSF && ( level2 || level3 )) { if (!generateEPSF && ( level2 || level3 )) {
float psw,psh; double psw,psh;
if (pw!=0 && ph!=0) { if (pw!=0 && ph!=0) {
psw=pw; psw=pw;
psh=ph; psh=ph;
@ -689,8 +691,8 @@ gsave newpath clippath pathbbox grestore\n\
"; ";
void void
PSHead(FILE *fd, TIFF *tif, uint32 w, uint32 h, float pw, float ph, PSHead(FILE *fd, TIFF *tif, uint32 w, uint32 h,
float ox, float oy) double pw, double ph, double ox, double oy)
{ {
time_t t; time_t t;
@ -801,9 +803,9 @@ PS_Lvl2colorspace(FILE* fd, TIFF* tif)
fputs(" <", fd); fputs(" <", fd);
for (i = 0; i < num_colors; i++) { for (i = 0; i < num_colors; i++) {
if (ascii85) { if (ascii85) {
Ascii85Put(rmap[i], fd); Ascii85Put((unsigned char)rmap[i], fd);
Ascii85Put(gmap[i], fd); Ascii85Put((unsigned char)gmap[i], fd);
Ascii85Put(bmap[i], fd); Ascii85Put((unsigned char)bmap[i], fd);
} else { } else {
fputs((i % 8) ? " " : "\n ", fd); fputs((i % 8) ? " " : "\n ", fd);
fprintf(fd, "%02x%02x%02x", fprintf(fd, "%02x%02x%02x",
@ -1179,10 +1181,10 @@ PS_Lvl2page(FILE* fd, TIFF* tif, uint32 w, uint32 h)
} }
if (use_rawdata) { if (use_rawdata) {
chunk_size = bc[0]; chunk_size = (tsize_t) bc[0];
for (chunk_no = 1; chunk_no < num_chunks; chunk_no++) for (chunk_no = 1; chunk_no < num_chunks; chunk_no++)
if (bc[chunk_no] > chunk_size) if ((tsize_t) bc[chunk_no] > chunk_size)
chunk_size = bc[chunk_no]; chunk_size = (tsize_t) bc[chunk_no];
} else { } else {
if (tiled_image) if (tiled_image)
chunk_size = TIFFTileSize(tif); chunk_size = TIFFTileSize(tif);
@ -1489,7 +1491,8 @@ void
PSDataColorSeparate(FILE* fd, TIFF* tif, uint32 w, uint32 h, int nc) PSDataColorSeparate(FILE* fd, TIFF* tif, uint32 w, uint32 h, int nc)
{ {
uint32 row; uint32 row;
int breaklen = MAXLINE, cc, s, maxs; int breaklen = MAXLINE, cc;
tsample_t s, maxs;
unsigned char *tf_buf; unsigned char *tf_buf;
unsigned char *cp, c; unsigned char *cp, c;
@ -1546,7 +1549,7 @@ PSDataPalette(FILE* fd, TIFF* tif, uint32 w, uint32 h)
} }
if (checkcmap(tif, 1<<bitspersample, rmap, gmap, bmap) == 16) { if (checkcmap(tif, 1<<bitspersample, rmap, gmap, bmap) == 16) {
int i; int i;
#define CVT(x) (((x) * 255) / ((1U<<16)-1)) #define CVT(x) ((unsigned short) (((x) * 255) / ((1U<<16)-1)))
for (i = (1<<bitspersample)-1; i >= 0; i--) { for (i = (1<<bitspersample)-1; i >= 0; i--) {
rmap[i] = CVT(rmap[i]); rmap[i] = CVT(rmap[i]);
gmap[i] = CVT(gmap[i]); gmap[i] = CVT(gmap[i]);
@ -1735,7 +1738,7 @@ PSRawDataBW(FILE* fd, TIFF* tif, uint32 w, uint32 h)
bufsize = bc[0]; bufsize = bc[0];
for ( s = 0; ++s < tf_numberstrips; ) { for ( s = 0; ++s < (tstrip_t)tf_numberstrips; ) {
if ( bc[s] > bufsize ) if ( bc[s] > bufsize )
bufsize = bc[s]; bufsize = bc[s];
} }
@ -1768,7 +1771,7 @@ PSRawDataBW(FILE* fd, TIFF* tif, uint32 w, uint32 h)
} }
#endif #endif
for (s = 0; s < tf_numberstrips; s++) { for (s = 0; s < (tstrip_t) tf_numberstrips; s++) {
cc = TIFFReadRawStrip(tif, s, tf_buf, bc[s]); cc = TIFFReadRawStrip(tif, s, tf_buf, bc[s]);
if (cc < 0) { if (cc < 0) {
TIFFError(filename, "Can't read strip"); TIFFError(filename, "Can't read strip");
@ -1825,17 +1828,17 @@ Ascii85Encode(unsigned char* raw)
uint16 w1; uint16 w1;
q = word / (85L*85*85*85); /* actually only a byte */ q = word / (85L*85*85*85); /* actually only a byte */
encoded[0] = q + '!'; encoded[0] = (char) (q + '!');
word -= q * (85L*85*85*85); q = word / (85L*85*85); word -= q * (85L*85*85*85); q = word / (85L*85*85);
encoded[1] = q + '!'; encoded[1] = (char) (q + '!');
word -= q * (85L*85*85); q = word / (85*85); word -= q * (85L*85*85); q = word / (85*85);
encoded[2] = q + '!'; encoded[2] = (char) (q + '!');
w1 = (uint16) (word - q*(85L*85)); w1 = (uint16) (word - q*(85L*85));
encoded[3] = (w1 / 85) + '!'; encoded[3] = (char) ((w1 / 85) + '!');
encoded[4] = (w1 % 85) + '!'; encoded[4] = (char) ((w1 % 85) + '!');
encoded[5] = '\0'; encoded[5] = '\0';
} else } else
encoded[0] = 'z', encoded[1] = '\0'; encoded[0] = 'z', encoded[1] = '\0';
@ -1948,17 +1951,17 @@ int Ascii85EncodeBlock( uint8 * ascii85_p, unsigned f_eod, const uint8 * raw_p,
else else
{ {
ascii85[4] = (val32 % 85) + 33; ascii85[4] = (char) ((val32 % 85) + 33);
val32 /= 85; val32 /= 85;
ascii85[3] = (val32 % 85) + 33; ascii85[3] = (char) ((val32 % 85) + 33);
val32 /= 85; val32 /= 85;
ascii85[2] = (val32 % 85) + 33; ascii85[2] = (char) ((val32 % 85) + 33);
val32 /= 85; val32 /= 85;
ascii85[1] = (val32 % 85) + 33; ascii85[1] = (char) ((val32 % 85) + 33);
ascii85[0] = (val32 / 85) + 33; ascii85[0] = (char) ((val32 / 85) + 33);
_TIFFmemcpy( &ascii85_p[ascii85_l], ascii85, sizeof(ascii85) ); _TIFFmemcpy( &ascii85_p[ascii85_l], ascii85, sizeof(ascii85) );
rc = sizeof(ascii85); rc = sizeof(ascii85);
@ -1990,14 +1993,14 @@ int Ascii85EncodeBlock( uint8 * ascii85_p, unsigned f_eod, const uint8 * raw_p,
val32 /= 85; val32 /= 85;
ascii85[3] = (val32 % 85) + 33;; ascii85[3] = (char) ((val32 % 85) + 33);
val32 /= 85; val32 /= 85;
ascii85[2] = (val32 % 85) + 33;; ascii85[2] = (char) ((val32 % 85) + 33);
val32 /= 85; val32 /= 85;
ascii85[1] = (val32 % 85) + 33;; ascii85[1] = (char) ((val32 % 85) + 33);
ascii85[0] = (val32 / 85) + 33;; ascii85[0] = (char) ((val32 / 85) + 33);
_TIFFmemcpy( &ascii85_p[ascii85_l], ascii85, len ); _TIFFmemcpy( &ascii85_p[ascii85_l], ascii85, len );
ascii85_l += len; ascii85_l += len;

5
tools/tiffcmp.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiffcmp.c,v 1.4 2003-06-18 09:57:55 dron Exp $ */ /* $Id: tiffcmp.c,v 1.5 2004-06-04 14:16:14 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -133,7 +133,8 @@ tiffcmp(TIFF* tif1, TIFF* tif2)
{ {
uint16 config1, config2; uint16 config1, config2;
tsize_t size1; tsize_t size1;
uint32 s, row; uint32 row;
tsample_t s;
unsigned char *buf1, *buf2; unsigned char *buf1, *buf2;
if (!CheckShortTag(tif1, tif2, TIFFTAG_BITSPERSAMPLE, "BitsPerSample")) if (!CheckShortTag(tif1, tif2, TIFFTAG_BITSPERSAMPLE, "BitsPerSample"))

4
tools/tiffmedian.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiffmedian.c,v 1.5 2003-08-21 10:00:06 dron Exp $ */ /* $Id: tiffmedian.c,v 1.6 2004-06-04 14:16:14 dron Exp $ */
/* /*
* Apply median cut on an image. * Apply median cut on an image.
@ -760,7 +760,7 @@ quant(TIFF* in, TIFF* out)
red = *inptr++ >> COLOR_SHIFT; red = *inptr++ >> COLOR_SHIFT;
green = *inptr++ >> COLOR_SHIFT; green = *inptr++ >> COLOR_SHIFT;
blue = *inptr++ >> COLOR_SHIFT; blue = *inptr++ >> COLOR_SHIFT;
*outptr++ = histogram[red][green][blue]; *outptr++ = (unsigned char)histogram[red][green][blue];
} }
if (TIFFWriteScanline(out, outline, i, 0) < 0) if (TIFFWriteScanline(out, outline, i, 0) < 0)
break; break;

6
tools/tiffsplit.c
View File

@ -1,4 +1,4 @@
/* $Id: tiffsplit.c,v 1.7 2004-05-25 16:02:22 dron Exp $ */ /* $Id: tiffsplit.c,v 1.8 2004-06-04 14:16:14 dron Exp $ */
/* /*
* Copyright (c) 1992-1997 Sam Leffler * Copyright (c) 1992-1997 Sam Leffler
@ -210,7 +210,7 @@ cpStrips(TIFF* in, TIFF* out)
TIFFGetField(in, TIFFTAG_STRIPBYTECOUNTS, &bytecounts); TIFFGetField(in, TIFFTAG_STRIPBYTECOUNTS, &bytecounts);
for (s = 0; s < ns; s++) { for (s = 0; s < ns; s++) {
if (bytecounts[s] > bufsize) { if (bytecounts[s] > (uint32)bufsize) {
buf = (unsigned char *)_TIFFrealloc(buf, bytecounts[s]); buf = (unsigned char *)_TIFFrealloc(buf, bytecounts[s]);
if (!buf) if (!buf)
return (0); return (0);
@ -240,7 +240,7 @@ cpTiles(TIFF* in, TIFF* out)
TIFFGetField(in, TIFFTAG_TILEBYTECOUNTS, &bytecounts); TIFFGetField(in, TIFFTAG_TILEBYTECOUNTS, &bytecounts);
for (t = 0; t < nt; t++) { for (t = 0; t < nt; t++) {
if (bytecounts[t] > bufsize) { if (bytecounts[t] > (uint32) bufsize) {
buf = (unsigned char *)_TIFFrealloc(buf, bytecounts[t]); buf = (unsigned char *)_TIFFrealloc(buf, bytecounts[t]);
if (!buf) if (!buf)
return (0); return (0);