394c394
< 		const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
---
> 		const TIFFField *fip = TIFFFindField(tif, tag, TIFF_ANY);
611c611
< 		TIFFSetFieldBit(tif, _TIFFFieldWithTag(tif, tag)->field_bit);
---
> 		TIFFSetFieldBit(tif, TIFFFieldWithTag(tif, tag)->field_bit);
622c622
< 		     _TIFFFieldWithTag(tif, tag)->field_name);
---
> 		     TIFFFieldWithTag(tif, tag)->field_name);
629c629
< 		     _TIFFFieldWithTag(tif, tag)->field_name);
---
> 		     TIFFFieldWithTag(tif, tag)->field_name);
646c646
< 	const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
---
> 	const TIFFField* fip = TIFFFindField(tif, tag, TIFF_ANY);
854c854,855
< 				const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
---
> 				const TIFFField* fip =
> 					TIFFFindField(tif, tag, TIFF_ANY);
858,862c859,865
< 				 * This can happen if multiple images are open with different
< 				 * codecs which have private tags.  The global tag information
< 				 * table may then have tags that are valid for one file but not
< 				 * the other. If the client tries to get a tag that is not valid
< 				 * for the image's codec then we'll arrive here.
---
> 				 * This can happen if multiple images are open
> 				 * with different codecs which have private
> 				 * tags.  The global tag information table may
> 				 * then have tags that are valid for one file
> 				 * but not the other. If the client tries to
> 				 * get a tag that is not valid for the image's
> 				 * codec then we'll arrive here.
1006c1009
< 	const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
---
> 	const TIFFField* fip = TIFFFindField(tif, tag, TIFF_ANY);
