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_pixarlog.c | |
parent | 6351780a75e7d2079d7049b45888e0ca22526c43 (diff) | |
download | libtiff-git-0de7ab49eb1141b64a8a6627cae5e1336a2b48a6.tar.gz |
Rename TIFFMergeField() function into TIFFMergeFields().
Diffstat (limited to 'libtiff/tif_pixarlog.c')
-rw-r--r-- | libtiff/tif_pixarlog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c index fe5e26a1..1926b8d1 100644 --- a/libtiff/tif_pixarlog.c +++ b/libtiff/tif_pixarlog.c @@ -1,4 +1,4 @@ -/* $Id: tif_pixarlog.c,v 1.28 2007-07-08 18:30:41 dron Exp $ */ +/* $Id: tif_pixarlog.c,v 1.29 2007-07-09 09:26:57 dron Exp $ */ /* * Copyright (c) 1996-1997 Sam Leffler @@ -1348,8 +1348,8 @@ TIFFInitPixarLog(TIFF* tif, int scheme) /* * Merge codec-specific tag information. */ - if (!_TIFFMergeField(tif, pixarlogFields, - TIFFArrayCount(pixarlogFields))) { + if (!_TIFFMergeFields(tif, pixarlogFields, + TIFFArrayCount(pixarlogFields))) { TIFFErrorExt(tif->tif_clientdata, module, "Merging PixarLog codec-specific tags failed"); return 0; |