diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2001-09-25 01:33:54 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2001-09-25 01:33:54 +0000 |
| commit | d430174dc5ed8b22a2546957f8bdb430fb6b1fb0 (patch) | |
| tree | ba6e346208003db55190bff6b8b809938381104b | |
| parent | b742bfb9c06b7121b5282d36f137234c79250385 (diff) | |
| download | libtiff-git-d430174dc5ed8b22a2546957f8bdb430fb6b1fb0.tar.gz | |
remove LZW hack, return status failure for compressor initializers
| -rw-r--r-- | libtiff/tif_dir.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c index 96b0a707..36741ab2 100644 --- a/libtiff/tif_dir.c +++ b/libtiff/tif_dir.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dir.c,v 1.15 2001-03-02 04:59:52 warmerda Exp $ */ +/* $Header: /cvs/maptools/cvsroot/libtiff/libtiff/tif_dir.c,v 1.16 2001-09-25 01:33:54 warmerda Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -167,16 +167,10 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va_list ap) /* * Setup new compression routine state. */ - if ( ! tif->tif_mode == O_RDONLY ) { - /* Handle removal of LZW compression */ - if ( v == COMPRESSION_LZW ) { - TIFFError(tif->tif_name, - "LZW compression no longer supported due to Unisys patent enforcement"); - v=COMPRESSION_NONE; - } - } if( (status = TIFFSetCompressionScheme(tif, v)) != 0 ) - td->td_compression = v; + td->td_compression = v; + else + status = 0; break; case TIFFTAG_PHOTOMETRIC: td->td_photometric = (uint16) va_arg(ap, int); |