summaryrefslogtreecommitdiff
path: root/libtiff/tif_dir.h
diff options
context:
space:
mode:
authorAndrey Kiselev <dron@ak4719.spb.edu>2007-07-09 10:15:37 +0000
committerAndrey Kiselev <dron@ak4719.spb.edu>2007-07-09 10:15:37 +0000
commitcd22afeaf9580c8bf7c3c63f2de7ec15c8c1fe68 (patch)
tree2f75d7600c8487f968026a2b87554b8a8fde4945 /libtiff/tif_dir.h
parent0de7ab49eb1141b64a8a6627cae5e1336a2b48a6 (diff)
downloadlibtiff-git-cd22afeaf9580c8bf7c3c63f2de7ec15c8c1fe68.tar.gz
More work on new tag extending scheme. Use the new scheme everywhere.
Diffstat (limited to 'libtiff/tif_dir.h')
-rw-r--r--libtiff/tif_dir.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/libtiff/tif_dir.h b/libtiff/tif_dir.h
index e232c51a..ebe71129 100644
--- a/libtiff/tif_dir.h
+++ b/libtiff/tif_dir.h
@@ -1,4 +1,4 @@
-/* $Id: tif_dir.h,v 1.46 2007-07-09 09:26:57 dron Exp $ */
+/* $Id: tif_dir.h,v 1.47 2007-07-09 10:15:37 dron Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -31,7 +31,7 @@
*/
typedef struct {
- const TIFFFieldInfo *info;
+ const TIFFField *info;
int count;
void *value;
} TIFFTagValue;
@@ -179,11 +179,6 @@ extern void _TIFFSetupFieldInfo(TIFF* tif, const TIFFFieldInfoArray* infoarray);
extern int _TIFFMergeFieldInfo(TIFF*, const TIFFFieldInfo[], uint32);
extern void _TIFFPrintFieldInfo(TIFF*, FILE*);
-#define _TIFFFindFieldInfo TIFFFindFieldInfo
-#define _TIFFFindFieldInfoByName TIFFFindFieldInfoByName
-#define _TIFFFieldWithTag TIFFFieldWithTag
-#define _TIFFFieldWithName TIFFFieldWithName
-
struct _TIFFFieldInfoArray;
struct _TIFFField {
@@ -201,8 +196,6 @@ struct _TIFFField {
const struct _TIFFFieldInfoArray* field_subfields; /* if field points to child ifds, child ifd field definition array */
};
-typedef struct _TIFFField TIFFField;
-
typedef enum {
tfiatImage,
tfiatExif,