1056c1056
< 			    if (!_TIFFFindFieldInfo(tif, 33918, TIFF_ANY)) {
---
> 			    if (!TIFFFindField(tif, 33918, TIFF_ANY)) {
1870c1870
< 	const TIFFFieldInfo* fip;
---
> 	const TIFFField* fip;
1912c1912
< 	if ((fip = _TIFFFieldWithTag(tif, tag))) {
---
> 	if ((fip = TIFFFieldWithTag(tif, tag))) {
2082c2082
< 	if (!_TIFFMergeField(tif, jpegFields, TIFFArrayCount(jpegFields))) {
---
> 	if (!_TIFFMergeFields(tif, jpegFields, TIFFArrayCount(jpegFields))) {
