diff options
| -rw-r--r-- | tools/bmp2tiff.c | 4 | ||||
| -rw-r--r-- | tools/fax2tiff.c | 3 | ||||
| -rw-r--r-- | tools/gif2tiff.c | 3 | ||||
| -rw-r--r-- | tools/pal2rgb.c | 3 | ||||
| -rw-r--r-- | tools/ras2tiff.c | 3 | ||||
| -rw-r--r-- | tools/raw2tiff.c | 3 | ||||
| -rw-r--r-- | tools/rgb2ycbcr.c | 3 | ||||
| -rw-r--r-- | tools/sgi2tiff.c | 3 | ||||
| -rw-r--r-- | tools/sgisv.c | 3 | ||||
| -rw-r--r-- | tools/tiff2bw.c | 3 | ||||
| -rw-r--r-- | tools/tiff2rgba.c | 3 | ||||
| -rw-r--r-- | tools/tiffcp.c | 3 | ||||
| -rw-r--r-- | tools/tiffdither.c | 3 | ||||
| -rw-r--r-- | tools/tiffmedian.c | 4 |
14 files changed, 15 insertions, 29 deletions
diff --git a/tools/bmp2tiff.c b/tools/bmp2tiff.c index 71a42b5d..025a2e0a 100644 --- a/tools/bmp2tiff.c +++ b/tools/bmp2tiff.c @@ -1,4 +1,4 @@ -/* $Id: bmp2tiff.c,v 1.3 2004-07-03 16:04:01 dron Exp $ +/* $Id: bmp2tiff.c,v 1.4 2004-07-24 19:03:16 dron Exp $ * * Project: libtiff tools * Purpose: Convert Windows BMP files in TIFF. @@ -699,7 +699,6 @@ static char* stuff[] = { " -r # make each strip have no more than # rows", "", " -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding", -" (no longer supported by default due to Unisys patent enforcement)", " -c zip[:opts] compress output with deflate encoding", " -c jpeg[:opts]compress output with JPEG encoding", " -c packbits compress output with packbits encoding", @@ -730,4 +729,3 @@ usage(void) fprintf(stderr, "%s\n", stuff[i]); exit(-1); } - diff --git a/tools/fax2tiff.c b/tools/fax2tiff.c index 6ec3e55e..ffe8f3e2 100644 --- a/tools/fax2tiff.c +++ b/tools/fax2tiff.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/tools/fax2tiff.c,v 1.10 2004-06-04 11:50:09 dron Exp $ */ +/* $Id: fax2tiff.c,v 1.11 2004-07-24 19:03:16 dron Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -410,6 +410,7 @@ char* stuff[] = { " -l output fill order is LSB2MSB [default]", " -s stretch image by duplicating scanlines", " -v print information about conversion work", +" -z generate LZW compressed output", NULL }; diff --git a/tools/gif2tiff.c b/tools/gif2tiff.c index b23e62d0..ee7c9ddc 100644 --- a/tools/gif2tiff.c +++ b/tools/gif2tiff.c @@ -1,4 +1,4 @@ -/* $Id: gif2tiff.c,v 1.5 2004-06-04 13:18:25 dron Exp $ */ +/* $Id: gif2tiff.c,v 1.6 2004-07-24 19:04:37 dron Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -64,7 +64,6 @@ char* stuff[] = { " -r # make each strip have no more than # rows", "", " -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding", -" (no longer supported by default due to Unisys patent enforcement)", " -c zip[:opts] compress output with deflate encoding", " -c packbits compress output with packbits encoding", " -c none use no compression algorithm on output", diff --git a/tools/pal2rgb.c b/tools/pal2rgb.c index 5dc4d5dd..2d5b7b03 100644 --- a/tools/pal2rgb.c +++ b/tools/pal2rgb.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/tools/pal2rgb.c,v 1.5 2004-06-04 13:18:25 dron Exp $ */ +/* $Id: pal2rgb.c,v 1.6 2004-07-24 19:04:37 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -362,7 +362,6 @@ char* stuff[] = { " -C 16 assume 16-bit colormap values", "", " -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding", -" (no longer supported by default due to Unisys patent enforcement)", " -c zip[:opts] compress output with deflate encoding", " -c packbits compress output with packbits encoding", " -c none use no compression algorithm on output", diff --git a/tools/ras2tiff.c b/tools/ras2tiff.c index 4c0f6c56..e6846088 100644 --- a/tools/ras2tiff.c +++ b/tools/ras2tiff.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/tools/Attic/ras2tiff.c,v 1.7 2003-11-12 19:14:33 dron Exp $ */ +/* $Id: ras2tiff.c,v 1.8 2004-07-24 19:04:37 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -256,7 +256,6 @@ char* stuff[] = { " -r # make each strip have no more than # rows", "", " -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding", -" (no longer supported by default due to Unisys patent enforcement)", " -c zip[:opts] compress output with deflate encoding", " -c jpeg[:opts] compress output with JPEG encoding", " -c packbits compress output with packbits encoding", diff --git a/tools/raw2tiff.c b/tools/raw2tiff.c index 90f969ae..1b085bc1 100644 --- a/tools/raw2tiff.c +++ b/tools/raw2tiff.c @@ -1,4 +1,4 @@ -/* $Id: raw2tiff.c,v 1.12 2004-06-29 19:19:17 dron Exp $ +/* $Id: raw2tiff.c,v 1.13 2004-07-24 19:04:37 dron Exp $ * * Project: libtiff tools * Purpose: Convert raw byte sequences in TIFF images @@ -565,7 +565,6 @@ static char* stuff[] = { " band band interleaved data", "", " -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding", -" (no longer supported by default due to Unisys patent enforcement)", " -c zip[:opts] compress output with deflate encoding", " -c jpeg[:opts]compress output with JPEG encoding", " -c packbits compress output with packbits encoding", diff --git a/tools/rgb2ycbcr.c b/tools/rgb2ycbcr.c index b76d174c..54e5f9fc 100644 --- a/tools/rgb2ycbcr.c +++ b/tools/rgb2ycbcr.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/tools/rgb2ycbcr.c,v 1.7 2004-06-04 13:18:25 dron Exp $ */ +/* $Id: rgb2ycbcr.c,v 1.8 2004-07-24 19:05:13 dron Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -324,7 +324,6 @@ char* stuff[] = { "where comp is one of the following compression algorithms:\n", " jpeg\t\tJPEG encoding\n", " lzw\t\tLempel-Ziv & Welch encoding\n", - " (lzw no longer supported by default due to Unisys patent enforcement)\n", " zip\t\tdeflate encoding\n", " packbits\tPackBits encoding (default)\n", " none\t\tno compression\n", diff --git a/tools/sgi2tiff.c b/tools/sgi2tiff.c index 8c0f5eef..4b1ca525 100644 --- a/tools/sgi2tiff.c +++ b/tools/sgi2tiff.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/tools/Attic/sgi2tiff.c,v 1.3 1999-12-27 17:35:01 mwelles Exp $ */ +/* $Id: sgi2tiff.c,v 1.4 2004-07-24 19:05:13 dron Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -292,7 +292,6 @@ char* stuff[] = { " -f msb2lsb force msb-to-lsb FillOrder for output", "", " -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding", -" (no longer supported by default due to Unisys patent enforcement)", " -c zip[:opts] compress output with deflate encoding", " -c jpeg[:opts]compress output with JPEG encoding", " -c packbits compress output with packbits encoding", diff --git a/tools/sgisv.c b/tools/sgisv.c index 405c250d..0fb6098a 100644 --- a/tools/sgisv.c +++ b/tools/sgisv.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/tools/Attic/sgisv.c,v 1.3 1999-12-27 17:35:01 mwelles Exp $ */ +/* $Id: sgisv.c,v 1.4 2004-07-24 19:05:13 dron Exp $ */ /* * Copyright (c) 1990-1997 Sam Leffler @@ -124,7 +124,6 @@ char* stuff[] = { " -r # make each strip have no more than # rows", "", " -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding", -" (no longer supported by default due to Unisys patent enforcement)", " -c jpeg[:opts]compress output with JPEG encoding", " -c packbits compress output with packbits encoding", " -c none use no compression algorithm on output", diff --git a/tools/tiff2bw.c b/tools/tiff2bw.c index d0c99184..0efd34a2 100644 --- a/tools/tiff2bw.c +++ b/tools/tiff2bw.c @@ -1,4 +1,4 @@ -/* $Id: tiff2bw.c,v 1.6 2004-06-04 13:46:25 dron Exp $ */ +/* $Id: tiff2bw.c,v 1.7 2004-07-24 19:05:13 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -376,7 +376,6 @@ char* stuff[] = { " -r # make each strip have no more than # rows", "", " -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding", -" (no longer supported by default due to Unisys patent enforcement)", " -c zip[:opts] compress output with deflate encoding", " -c packbits compress output with packbits encoding", " -c g3[:opts] compress output with CCITT Group 3 encoding", diff --git a/tools/tiff2rgba.c b/tools/tiff2rgba.c index 68c43e3c..6ef8a90e 100644 --- a/tools/tiff2rgba.c +++ b/tools/tiff2rgba.c @@ -1,4 +1,4 @@ -/* $Id: tiff2rgba.c,v 1.8 2004-06-04 13:46:25 dron Exp $ */ +/* $Id: tiff2rgba.c,v 1.9 2004-07-24 19:05:57 dron Exp $ */ /* * Copyright (c) 1991-1997 Sam Leffler @@ -455,7 +455,6 @@ static char* stuff[] = { " jpeg\t\tJPEG encoding\n", " zip\t\tLempel-Ziv & Welch encoding\n", " lzw\t\tLempel-Ziv & Welch encoding\n", - " (lzw compression unsupported by default due to Unisys patent enforcement)\n", " packbits\tPackBits encoding\n", " none\t\tno compression\n", "and the other options are:\n", diff --git a/tools/tiffcp.c b/tools/tiffcp.c index 2a2e8558..8f3d6b73 100644 --- a/tools/tiffcp.c +++ b/tools/tiffcp.c @@ -1,4 +1,4 @@ -/* $Id: tiffcp.c,v 1.23 2004-05-19 15:16:45 warmerda Exp $ */ +/* $Id: tiffcp.c,v 1.24 2004-07-24 19:05:57 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -369,7 +369,6 @@ char* stuff[] = { " -f msb2lsb force msb-to-lsb FillOrder for output", "", " -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding", -" (no longer supported by default due to Unisys patent enforcement)", " -c zip[:opts] compress output with deflate encoding", " -c jpeg[:opts] compress output with JPEG encoding", " -c packbits compress output with packbits encoding", diff --git a/tools/tiffdither.c b/tools/tiffdither.c index 0d9af56d..db314919 100644 --- a/tools/tiffdither.c +++ b/tools/tiffdither.c @@ -1,4 +1,4 @@ -/* $Header: /cvs/maptools/cvsroot/libtiff/tools/tiffdither.c,v 1.6 2003-05-05 19:13:42 dron Exp $ */ +/* $Id: tiffdither.c,v 1.7 2004-07-24 19:05:57 dron Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -285,7 +285,6 @@ char* stuff[] = { " -f lsb2msb force lsb-to-msb FillOrder for output", " -f msb2lsb force msb-to-lsb FillOrder for output", " -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding", -" (no longer supported by default due to Unisys patent enforcement)", " -c zip[:opts] compress output with deflate encoding", " -c packbits compress output with packbits encoding", " -c g3[:opts] compress output with CCITT Group 3 encoding", diff --git a/tools/tiffmedian.c b/tools/tiffmedian.c index 6df1540a..8b4f958d 100644 --- a/tools/tiffmedian.c +++ b/tools/tiffmedian.c @@ -1,4 +1,4 @@ -/* $Id: tiffmedian.c,v 1.6 2004-06-04 14:16:14 dron Exp $ */ +/* $Id: tiffmedian.c,v 1.7 2004-07-24 19:03:16 dron Exp $ */ /* * Apply median cut on an image. @@ -7,7 +7,6 @@ * -C n - set colortable size. Default is 256. * -f - use Floyd-Steinberg dithering. * -c lzw - compress output with LZW - * (no longer supported by default due to unisys patent enforcement) * -c none - use no compression on output * -c packbits - use packbits compression on output * -r n - create output with n rows/strip of data @@ -313,7 +312,6 @@ char* stuff[] = { " -C # create a colormap with # entries", " -f use Floyd-Steinberg dithering", " -c lzw[:opts] compress output with Lempel-Ziv & Welch encoding", -" (no longer supported by default due to Unisys patent enforcement)", " -c zip[:opts] compress output with deflate encoding", " -c packbits compress output with packbits encoding", " -c none use no compression algorithm on output", |