1114c1114
< static const TIFFField faxFields[] = {
---
> static const TIFFFieldInfo faxFieldInfo[] = {
1120c1120
< static const TIFFField fax3Fields[] = {
---
> static const TIFFFieldInfo fax3FieldInfo[] = {
1123c1123
< static const TIFFField fax4Fields[] = {
---
> static const TIFFFieldInfo fax4FieldInfo[] = {
1125a1126
> #define	N(a)	(sizeof (a) / sizeof (a[0]))
1269c1270
< 	if (!_TIFFMergeField(tif, faxFields, TIFFArrayCount(faxFields))) {
---
> 	if (!_TIFFMergeFieldInfo(tif, faxFieldInfo, N(faxFieldInfo))) {
1336,1337c1337
< 		if (!_TIFFMergeField(tif, fax3Fields,
< 				     TIFFArrayCount(fax3Fields))) {
---
> 		if (!_TIFFMergeFieldInfo(tif, fax3FieldInfo, N(fax3FieldInfo))) {
1454,1455c1454
< 		if (!_TIFFMergeField(tif, fax4Fields,
< 				     TIFFArrayCount(fax4Fields))) {
---
> 		if (!_TIFFMergeFieldInfo(tif, fax4FieldInfo, N(fax4FieldInfo))) {
