diff options
author | Andrey Kiselev <dron@ak4719.spb.edu> | 2007-07-09 09:26:57 +0000 |
---|---|---|
committer | Andrey Kiselev <dron@ak4719.spb.edu> | 2007-07-09 09:26:57 +0000 |
commit | 0de7ab49eb1141b64a8a6627cae5e1336a2b48a6 (patch) | |
tree | 587794fab38af6ff6051b05e0f8069107ff45a05 /libtiff/tif_dir.h | |
parent | 6351780a75e7d2079d7049b45888e0ca22526c43 (diff) | |
download | libtiff-git-0de7ab49eb1141b64a8a6627cae5e1336a2b48a6.tar.gz |
Rename TIFFMergeField() function into TIFFMergeFields().
Diffstat (limited to 'libtiff/tif_dir.h')
-rw-r--r-- | libtiff/tif_dir.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libtiff/tif_dir.h b/libtiff/tif_dir.h index b31f3c00..e232c51a 100644 --- a/libtiff/tif_dir.h +++ b/libtiff/tif_dir.h @@ -1,4 +1,4 @@ -/* $Id: tif_dir.h,v 1.45 2007-07-08 18:30:41 dron Exp $ */ +/* $Id: tif_dir.h,v 1.46 2007-07-09 09:26:57 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -216,7 +216,7 @@ struct _TIFFFieldInfoArray { const TIFFField* fieldinfo; /* actual field info */ }; -extern int _TIFFMergeField(TIFF*, const TIFFField[], uint32); +extern int _TIFFMergeFields(TIFF*, const TIFFField[], uint32); extern const TIFFField* _TIFFFindOrRegisterFieldInfo(TIFF *, uint32, TIFFDataType); extern TIFFField* _TIFFCreateAnonField(TIFF *, uint32, TIFFDataType); |