3283c3283
< 	const TIFFField* fip;
---
> 	const TIFFFieldInfo* fip;
3374,3378c3374,3379
< 				if (!_TIFFMergeField(tif,
< 					_TIFFCreateAnonField(tif,
< 						dp->tdir_tag,
< 						(TIFFDataType) dp->tdir_type),
< 					1)) {
---
> 				if (!_TIFFMergeFieldInfo(tif,
> 				    _TIFFCreateAnonFieldInfo(tif,
> 				    dp->tdir_tag,
> 				    (TIFFDataType) dp->tdir_type),
> 				    1))
> 				{
3385c3386,3388
< 				} else {
---
> 				}
> 				else
> 				{
3926c3929
< 	const TIFFField* fip;
---
> 	const TIFFFieldInfo* fip;
3946,3949c3949,3954
< 			if (!_TIFFMergeField(tif, _TIFFCreateAnonField(tif,
< 						dp->tdir_tag,
< 						(TIFFDataType) dp->tdir_type),
< 					     1)) {
---
> 			if (!_TIFFMergeFieldInfo(tif,
> 			    _TIFFCreateAnonFieldInfo(tif,
> 			    dp->tdir_tag,
> 			    (TIFFDataType) dp->tdir_type),
> 			    1))
> 			{
3954c3959,3961
< 			} else {
---
> 			}
> 			else
> 			{
4444c4451
< 	const TIFFField* fip;
---
> 	const TIFFFieldInfo* fip;
