diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2011-05-17 00:21:17 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2011-05-17 00:21:17 +0000 |
| commit | 9437f9db5a5df8c45a06dc6ecd1765219fdb1a1e (patch) | |
| tree | a1ef8d730698a63caa7978ede31271af1b2b30ff /libtiff/tiffio.h | |
| parent | bb96a66b1d83a3b579dcf456ceb69beeefd0e3fc (diff) | |
| download | libtiff-git-9437f9db5a5df8c45a06dc6ecd1765219fdb1a1e.tar.gz | |
restore TIFFMergeFieldInfo (#2315)
Diffstat (limited to 'libtiff/tiffio.h')
| -rw-r--r-- | libtiff/tiffio.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h index 263b156f..d223b2c5 100644 --- a/libtiff/tiffio.h +++ b/libtiff/tiffio.h @@ -1,4 +1,4 @@ -/* $Id: tiffio.h,v 1.87 2011-04-20 15:23:38 fwarmerdam Exp $ */ +/* $Id: tiffio.h,v 1.88 2011-05-17 00:21:17 fwarmerdam Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -512,6 +512,25 @@ extern int TIFFYCbCrToRGBInit(TIFFYCbCrToRGB*, float*, float*); extern void TIFFYCbCrtoRGB(TIFFYCbCrToRGB *, uint32, int32, int32, uint32 *, uint32 *, uint32 *); +/**************************************************************************** + * O B S O L E T E D I N T E R F A C E S + * + * Don't use this stuff in your applications, it may be removed in the future + * libtiff versions. + ****************************************************************************/ +typedef struct { + ttag_t field_tag; /* field's tag */ + short field_readcount; /* read count/TIFF_VARIABLE/TIFF_SPP */ + short field_writecount; /* write count/TIFF_VARIABLE */ + TIFFDataType field_type; /* type of associated data */ + unsigned short field_bit; /* bit in fieldsset bit vector */ + unsigned char field_oktochange; /* if true, can change while writing */ + unsigned char field_passcount; /* if true, pass dir count on set */ + char *field_name; /* ASCII name */ +} TIFFFieldInfo; + +extern int TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], uint32); + #if defined(c_plusplus) || defined(__cplusplus) } #endif |