diff --git a/ChangeLog b/ChangeLog index 1288e049..365dfcdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-06-21 Frank Warmerdam + + * libtiff/libtiff.def: Restore TIFFMergeFieldInfo. + 2011-05-31 Jim Meyering * libtiff/tif_dirread.c (TIFFFetchStripThing): Free "data" also diff --git a/libtiff/libtiff.def b/libtiff/libtiff.def index d7373188..a8cf7521 100644 --- a/libtiff/libtiff.def +++ b/libtiff/libtiff.def @@ -148,3 +148,4 @@ EXPORTS TIFFOpen TIFFSwabArrayOfLong8 TIFFFindField TIFFUnsetField + TIFMergeFieldInfo