diff options
Diffstat (limited to 'libtiff/tiffiop.h')
| -rw-r--r-- | libtiff/tiffiop.h | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h index cadbeeec..7bed4abd 100644 --- a/libtiff/tiffiop.h +++ b/libtiff/tiffiop.h @@ -1,4 +1,4 @@ -/* $Id: tiffiop.h,v 1.81 2011-01-24 21:06:32 olivier Exp $ */ +/* $Id: tiffiop.h,v 1.82 2011-02-18 20:53:05 fwarmerdam Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -58,6 +58,7 @@ extern void *lfind(const void *, const void *, size_t *, size_t, #endif #include "tiffio.h" + #include "tif_dir.h" #ifndef STRIP_SIZE_DEFAULT @@ -71,28 +72,6 @@ extern void *lfind(const void *, const void *, size_t *, size_t, #define FALSE 0 #endif -/* - * TIFF Image File Directories are comprised of a table of field - * descriptors of the form shown below. The table is sorted in - * ascending order by tag. The values associated with each entry are - * disjoint and may appear anywhere in the file (so long as they are - * placed on a word boundary). - * - * If the value is 4 bytes or less, in ClassicTIFF, or 8 bytes or less in - * BigTIFF, then it is placed in the offset field to save space. If so, - * it is left-justified in the offset field. - */ -typedef struct { - uint16 tdir_tag; /* see below */ - uint16 tdir_type; /* data type; see below */ - uint64 tdir_count; /* number of items; length in spec */ - union { - uint16 toff_short; - uint32 toff_long; - uint64 toff_long8; - } tdir_offset; /* either offset or the data itself if fits */ -} TIFFDirEntry; - typedef struct client_info { struct client_info *next; void *data; |