From f3758c6b0e8c56b0e3d653a7636094fce3783814 Mon Sep 17 00:00:00 2001 From: Andrey Kiselev Date: Wed, 4 Jul 2007 14:04:47 +0000 Subject: [PATCH] Unused TIFFReassignTagToIgnore() function and TIFFIgnoreSense enumeration removed. --- libtiff/libtiff.def | 1 - libtiff/tif_dir.c | 52 +-------------------------------------------- libtiff/tiff.h | 10 +-------- libtiff/tiffio.h | 3 +-- 4 files changed, 3 insertions(+), 63 deletions(-) diff --git a/libtiff/libtiff.def b/libtiff/libtiff.def index 3caefd83..a9f86645 100644 --- a/libtiff/libtiff.def +++ b/libtiff/libtiff.def @@ -137,4 +137,3 @@ EXPORTS TIFFOpen TIFFAccessTagMethods TIFFGetClientInfo TIFFSetClientInfo - TIFFReassignTagToIgnore diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c index 9e54c6ea..6ad8a594 100644 --- a/libtiff/tif_dir.c +++ b/libtiff/tif_dir.c @@ -1,4 +1,4 @@ -/* $Id: tif_dir.c,v 1.92 2007-06-27 16:09:58 joris Exp $ */ +/* $Id: tif_dir.c,v 1.93 2007-07-04 14:04:47 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -1464,54 +1464,4 @@ TIFFUnlinkDirectory(TIFF* tif, uint16 dirn) return (1); } -/* [BFC] - * - * Author: Bruce Cameron - * - * Set a table of tags that are to be replaced during directory process by the - * 'IGNORE' state - or return TRUE/FALSE for the requested tag such that - * 'ReadDirectory' can use the stored information. - * - * FIXME: this is never used properly. Should be removed in the future. - */ -int -TIFFReassignTagToIgnore (enum TIFFIgnoreSense task, int TIFFtagID) -{ - static int TIFFignoretags [FIELD_LAST]; - static int tagcount = 0 ; - int i; /* Loop index */ - int j; /* Loop index */ - - switch (task) - { - case TIS_STORE: - if ( tagcount < (FIELD_LAST - 1) ) - { - for ( j = 0 ; j < tagcount ; ++j ) - { - /* Do not add duplicate tag */ - if ( TIFFignoretags [j] == TIFFtagID ) - return (TRUE) ; - } - TIFFignoretags [tagcount++] = TIFFtagID ; - return (TRUE) ; - } - break ; - case TIS_EXTRACT: - for ( i = 0 ; i < tagcount ; ++i ) - { - if ( TIFFignoretags [i] == TIFFtagID ) - return (TRUE) ; - } - break; - case TIS_EMPTY: - tagcount = 0 ; /* Clear the list */ - return (TRUE) ; - default: - break; - } - - return (FALSE); -} - /* vim: set ts=8 sts=8 sw=8 noet: */ diff --git a/libtiff/tiff.h b/libtiff/tiff.h index bbc90262..10a0fb27 100644 --- a/libtiff/tiff.h +++ b/libtiff/tiff.h @@ -1,4 +1,4 @@ -/* $Id: tiff.h,v 1.61 2007-06-27 12:28:16 joris Exp $ */ +/* $Id: tiff.h,v 1.62 2007-07-04 14:04:48 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -87,14 +87,6 @@ typedef TIFF_UINT64_T uint64; typedef int uint16_vap; -/* For TIFFReassignTagToIgnore */ -enum TIFFIgnoreSense /* IGNORE tag table */ -{ - TIS_STORE, - TIS_EXTRACT, - TIS_EMPTY -}; - /* * TIFF header. */ diff --git a/libtiff/tiffio.h b/libtiff/tiffio.h index 404b9bf1..54cfeaf9 100644 --- a/libtiff/tiffio.h +++ b/libtiff/tiffio.h @@ -1,4 +1,4 @@ -/* $Id: tiffio.h,v 1.73 2007-07-04 13:21:32 dron Exp $ */ +/* $Id: tiffio.h,v 1.74 2007-07-04 14:04:48 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -425,7 +425,6 @@ extern int TIFFVSetField(TIFF*, uint32, va_list); extern int TIFFWriteDirectory(TIFF *); extern int TIFFCheckpointDirectory(TIFF *); extern int TIFFRewriteDirectory(TIFF *); -extern int TIFFReassignTagToIgnore(enum TIFFIgnoreSense, int); #if defined(c_plusplus) || defined(__cplusplus) extern void TIFFPrintDirectory(TIFF*, FILE*, long = 0);