402c402
< 	if (!_TIFFMergeField(tif, ojpegFields, TIFFArrayCount(ojpegFields))) {
---
> 	if (!_TIFFMergeFields(tif, ojpegFields, TIFFArrayCount(ojpegFields))) {
572c572
< 	TIFFSetFieldBit(tif,_TIFFFieldWithTag(tif,tag)->field_bit);
---
> 	TIFFSetFieldBit(tif,TIFFFieldWithTag(tif,tag)->field_bit);
