Date: Thu, 14 Jul 1994 14:32:31 -0700
From: gregc@cgl.ucsf.EDU
To: mpichler@iicm.tu-graz.ac.at
Subject: Re: TIFF library for 64bit machines and xv-3.00

Enclosed are the diff's to xvtiff.c that I had to make after switching
the version of tiff it used from version 3.2 to version 3.3beta.  I
don't read the tiff mailing list, but your request was forwarded by
someone who does.

	Hope this helps,

	Greg Couch
	gregc@cgl.ucsf.edu
-------
diff /home/diderot/a/gregc/xv-3.00/xvtiff.c ./xvtiff.c
37,38c37,38
<   long   w, h;
<   short	 bps, spp, photo, orient;
---
>   uint32   w, h;
>   uint16   bps, spp, photo, orient;
150,151c150,151
<      long  w,h;
<      int   photo,bps;
---
>      uint32  w,h;
>      uint16   photo,bps;
188,189c188,189
<      long  w,h;
<      int   photo,bps;
---
>      uint32  w,h;
>      uint16   photo,bps;
265,268c265,268
< static	u_short bitspersample;
< static	u_short samplesperpixel;
< static	u_short photometric;
< static	u_short orientation;
---
> static	uint16 bitspersample;
> static	uint16 samplesperpixel;
> static	uint16 photometric;
> static	uint16 orientation;
271c271
< static	u_short *redcmap, *greencmap, *bluecmap;
---
> static	uint16 *redcmap, *greencmap, *bluecmap;
275,276c275,276
< static	u_short YCbCrHorizSampling;
< static	u_short YCbCrVertSampling;
---
> static	uint16 YCbCrHorizSampling;
> static	uint16 YCbCrVertSampling;
287c287
<      u_long rwidth, rheight;
---
>      uint32 rwidth, rheight;
292c292
<   u_long width, height;
---
>   uint32 width, height;
359c359
<      u_short *r, *g, *b;
---
>      uint16 *r, *g, *b;
377,378c377,378
<      int w, h;
<      u_long *raster;
---
>      uint32 w, h;
>      byte *raster;
380c380
<   u_short minsamplevalue, maxsamplevalue, planarconfig;
---
>   uint16 minsamplevalue, maxsamplevalue, planarconfig;
499c499
< u_long setorientation(tif, h)
---
> int32 setorientation(tif, h)
501c501
<      u_long h;
---
>      int32 h;
503c503
<   u_long y;
---
>   int32 y;
536c536
<     (byte*, u_char*, RGBvalue*, u_long, u_long, int, int);
---
>     (byte*, u_char*, RGBvalue*, uint32, uint32, int, int);
556c556
<      u_long h, w;
---
>      uint32 h, w;
559,560c559,560
<   u_long col, row, y;
<   u_long tw, th;
---
>   uint32 col, row, y;
>   uint32 tw, th;
590c590
< 	u_long npix = w - col;
---
> 	uint32 npix = w - col;
610c610
<     (byte*, u_char*, u_char*, u_char*, RGBvalue*, u_long, u_long, int, int);
---
>     (byte*, u_char*, u_char*, u_char*, RGBvalue*, uint32, uint32, int, int);
627c627
<      u_long h, w;
---
>      uint32 h, w;
630,631c630,631
< 	u_long col, row, y;
< 	u_long tw, th;
---
> 	uint32 col, row, y;
> 	uint32 tw, th;
669c669
< 				u_long npix = w - col;
---
> 				uint32 npix = w - col;
695c695
< 	u_long h, w;
---
> 	uint32 h, w;
698c698
< 	u_long row, y, nrow;
---
> 	uint32 row, y, nrow;
701,702c701,702
< 	u_long rowsperstrip;
< 	u_long imagewidth;
---
> 	uint32 rowsperstrip;
> 	uint32 imagewidth;
744c744
< 	u_long h, w;
---
> 	uint32 h, w;
749c749
< 	u_long row, y, nrow;
---
> 	uint32 row, y, nrow;
752,753c752,753
< 	u_long rowsperstrip;
< 	u_long imagewidth;
---
> 	uint32 rowsperstrip;
> 	uint32 imagewidth;
921c921
< 	register u_long x;		\
---
> 	register uint32 x;		\
932c932
< 	register u_long x;		\
---
> 	register uint32 x;		\
943c943
< 	register u_long x;		\
---
> 	register uint32 x;		\
965c965
< 	u_long w, h;
---
> 	uint32 w, h;
983c983
< 	u_long w, h;
---
> 	uint32 w, h;
1004c1004
< 	u_long w, h;
---
> 	uint32 w, h;
1025c1025
< 	u_long w, h;
---
> 	uint32 w, h;
1046c1046
< 	u_long w, h;
---
> 	uint32 w, h;
1050c1050
< 		register u_long x;
---
> 		register uint32 x;
1066c1066
< 	u_long w, h;
---
> 	uint32 w, h;
1087c1087
< 	u_long w, h;
---
> 	uint32 w, h;
1108c1108
< 	u_long w, h;
---
> 	uint32 w, h;
1129c1129
< 	u_long w, h;
---
> 	uint32 w, h;
1135c1135
< 			register u_long x;
---
> 			register uint32 x;
1164c1164
< 	register u_short *pp;
---
> 	register uint16 *pp;
1166c1166
< 	u_long w, h;
---
> 	uint32 w, h;
1205c1205
< 	u_long w, h;
---
> 	uint32 w, h;
1211c1211
< 			register u_long x;
---
> 			register uint32 x;
1239c1239
< 	register u_short *r, *g, *b;
---
> 	register uint16 *r, *g, *b;
1241c1241
< 	u_long w, h;
---
> 	uint32 w, h;
1244c1244
< 	register u_long x;
---
> 	register uint32 x;
1296c1296
< 	u_long w;
---
> 	uint32 w;
1334c1334
< 	u_long w, h;
---
> 	uint32 w, h;
1339c1339
< 	u_long x;
---
> 	uint32 x;

