summaryrefslogtreecommitdiff
path: root/libtiff/tif_pixarlog.c
diff options
context:
space:
mode:
authorAndrey Kiselev <dron@ak4719.spb.edu>2007-07-08 18:30:41 +0000
committerAndrey Kiselev <dron@ak4719.spb.edu>2007-07-08 18:30:41 +0000
commit6678ac1b5eb4b316d3b393accb16aa44af10cf6f (patch)
tree1cbe0f4c05a97bb8eed87c94203d0cbc20a0a107 /libtiff/tif_pixarlog.c
parentde5235e3af9359e5e85322cd79bf758c7c532d04 (diff)
downloadlibtiff-git-6678ac1b5eb4b316d3b393accb16aa44af10cf6f.tar.gz
TIFFFIeldInfo structure replaced with TIFFField structure. TIFFFieldInfo
retained for the backward compatibility.
Diffstat (limited to 'libtiff/tif_pixarlog.c')
-rw-r--r--libtiff/tif_pixarlog.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libtiff/tif_pixarlog.c b/libtiff/tif_pixarlog.c
index 09b1e445..fe5e26a1 100644
--- a/libtiff/tif_pixarlog.c
+++ b/libtiff/tif_pixarlog.c
@@ -1,4 +1,4 @@
-/* $Id: tif_pixarlog.c,v 1.27 2007-06-28 12:43:08 joris Exp $ */
+/* $Id: tif_pixarlog.c,v 1.28 2007-07-08 18:30:41 dron Exp $ */
/*
* Copyright (c) 1996-1997 Sam Leffler
@@ -1331,7 +1331,7 @@ PixarLogVGetField(TIFF* tif, uint32 tag, va_list ap)
return (1);
}
-static const TIFFFieldInfo pixarlogFieldInfo[] = {
+static const TIFFField pixarlogFields[] = {
{TIFFTAG_PIXARLOGDATAFMT, 0, 0, TIFF_ANY, 0, TIFF_SETGET_INT, TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, FALSE, FALSE, "", NULL},
{TIFFTAG_PIXARLOGQUALITY, 0, 0, TIFF_ANY, 0, TIFF_SETGET_INT, TIFF_SETGET_UNDEFINED, FIELD_PSEUDO, FALSE, FALSE, "", NULL}
};
@@ -1348,8 +1348,8 @@ TIFFInitPixarLog(TIFF* tif, int scheme)
/*
* Merge codec-specific tag information.
*/
- if (!_TIFFMergeFieldInfo(tif, pixarlogFieldInfo,
- TIFFArrayCount(pixarlogFieldInfo))) {
+ if (!_TIFFMergeField(tif, pixarlogFields,
+ TIFFArrayCount(pixarlogFields))) {
TIFFErrorExt(tif->tif_clientdata, module,
"Merging PixarLog codec-specific tags failed");
return 0;