175a176
> #define FIELD_OJPEG_COUNT 7
177c178
< static const TIFFField ojpegFields[] = {
---
> static const TIFFFieldInfo ojpeg_field_info[] = {
402c403
< 	if (!_TIFFMergeField(tif, ojpegFields, TIFFArrayCount(ojpegFields))) {
---
> 	if (!_TIFFMergeFieldInfo(tif,ojpeg_field_info,FIELD_OJPEG_COUNT)) {
