3374c3374
< 				if (!_TIFFMergeField(tif,
---
> 				if (!_TIFFMergeFields(tif,
3529c3529
< 						TIFFReadDirEntryOutputErr(tif,err,module,_TIFFFieldWithTag(tif,dp->tdir_tag)->field_name,0);
---
> 						TIFFReadDirEntryOutputErr(tif,err,module,TIFFFieldWithTag(tif,dp->tdir_tag)->field_name,0);
3544c3544
< 						TIFFReadDirEntryOutputErr(tif,err,module,_TIFFFieldWithTag(tif,dp->tdir_tag)->field_name,0);
---
> 						TIFFReadDirEntryOutputErr(tif,err,module,TIFFFieldWithTag(tif,dp->tdir_tag)->field_name,0);
3585c3585
< 						TIFFReadDirEntryOutputErr(tif,err,module,_TIFFFieldWithTag(tif,dp->tdir_tag)->field_name,1);
---
> 						TIFFReadDirEntryOutputErr(tif,err,module,TIFFFieldWithTag(tif,dp->tdir_tag)->field_name,1);
3712c3712
< 				_TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
---
> 				TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
3747c3747
< 			    _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
---
> 			    TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
3764c3764
< 			    _TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
---
> 			    TIFFFieldWithTag(tif,TIFFTAG_STRIPBYTECOUNTS)->field_name);
3946c3946
< 			if (!_TIFFMergeField(tif, _TIFFCreateAnonField(tif,
---
> 			if (!_TIFFMergeFields(tif, _TIFFCreateAnonField(tif,
4169,4170c4169,4170
< 		    "incorrect count for field \"%s\" (%llu, expecting %lu); tag ignored",
< 		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
---
> 	"incorrect count for field \"%s\" (%llu, expecting %lu); tag ignored",
> 		    TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
4175,4176c4175,4176
< 		    "incorrect count for field \"%s\" (%llu, expecting %lu); tag trimmed",
< 		    _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
---
> 	"incorrect count for field \"%s\" (%llu, expecting %lu); tag trimmed",
> 		    TIFFFieldWithTag(tif, dir->tdir_tag)->field_name,
5074c5074
< 		TIFFReadDirEntryOutputErr(tif,err,module,_TIFFFieldWithTag(tif,dir->tdir_tag)->field_name,0);
---
> 		TIFFReadDirEntryOutputErr(tif,err,module,TIFFFieldWithTag(tif,dir->tdir_tag)->field_name,0);
