summaryrefslogtreecommitdiff
path: root/libtiff/tif_zip.c
diff options
context:
space:
mode:
authorAndrey Kiselev <dron@ak4719.spb.edu>2007-07-09 09:26:57 +0000
committerAndrey Kiselev <dron@ak4719.spb.edu>2007-07-09 09:26:57 +0000
commit0de7ab49eb1141b64a8a6627cae5e1336a2b48a6 (patch)
tree587794fab38af6ff6051b05e0f8069107ff45a05 /libtiff/tif_zip.c
parent6351780a75e7d2079d7049b45888e0ca22526c43 (diff)
downloadlibtiff-git-0de7ab49eb1141b64a8a6627cae5e1336a2b48a6.tar.gz
Rename TIFFMergeField() function into TIFFMergeFields().
Diffstat (limited to 'libtiff/tif_zip.c')
-rw-r--r--libtiff/tif_zip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libtiff/tif_zip.c b/libtiff/tif_zip.c
index 854e22e0..9af48421 100644
--- a/libtiff/tif_zip.c
+++ b/libtiff/tif_zip.c
@@ -1,4 +1,4 @@
-/* $Id: tif_zip.c,v 1.24 2007-07-08 18:30:41 dron Exp $ */
+/* $Id: tif_zip.c,v 1.25 2007-07-09 09:26:57 dron Exp $ */
/*
* Copyright (c) 1995-1997 Sam Leffler
@@ -394,7 +394,7 @@ TIFFInitZIP(TIFF* tif, int scheme)
/*
* Merge codec-specific tag information.
*/
- if (!_TIFFMergeField(tif, zipFields, TIFFArrayCount(zipFields))) {
+ if (!_TIFFMergeFields(tif, zipFields, TIFFArrayCount(zipFields))) {
TIFFErrorExt(tif->tif_clientdata, module,
"Merging Deflate codec-specific tags failed");
return 0;