From feb6bd9f1df6d3f65f17227158ddf278b121f52e Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 6 Mar 2013 03:35:09 +0000 Subject: [PATCH] Sync tool usage printouts and man pages with reality. --- ChangeLog | 9 +++ html/man/tiff2ps.1.html | 111 ++++++++++++++++++++++++++++++++++++- html/man/tiffcp.1.html | 63 ++++++++++++++++----- html/man/tiffdither.1.html | 13 +++++ man/tiff2ps.1 | 43 ++++++++++---- man/tiffcp.1 | 17 +++++- man/tiffdither.1 | 5 +- tools/tiff2ps.c | 13 +++-- tools/tiffcp.c | 10 +++- tools/tiffdither.c | 3 +- 10 files changed, 245 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1200c98..75f84434 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2013-03-05 Tom Lane + + * html/man/tiff2ps.1.html, html/man/tiffcp.1.html, + html/man/tiffdither.1.html, man/tiff2ps.1, man/tiffcp.1, + man/tiffdither.1, tools/tiff2ps.c, tools/tiffcp.c, + tools/tiffdither.c: Sync tool usage printouts and man pages with + reality (quite a few options had escaped being documented in one + or both places). Per an old report from Miroslav Vadkerti. + 2013-01-25 Bob Friesenhahn * tools/tiff2ps.c:Fix bug in auto rotate option code. Once a diff --git a/html/man/tiff2ps.1.html b/html/man/tiff2ps.1.html index ef2cd7f9..7e2ce15c 100644 --- a/html/man/tiff2ps.1.html +++ b/html/man/tiff2ps.1.html @@ -128,6 +128,19 @@ images.

+

−8

+ + + + +

Disable use of ASCII85 encoding with PostScript Level 2/3.

+ + + + + + +

−a

@@ -171,6 +184,19 @@ an effect if both the −w and the +

−C

+ + + + +

Specify the document creator name.

+ + + + + + +

−d

@@ -187,6 +213,19 @@ individual pages in a multi-page (e.g. facsimile) file.

+

−D

+ + + + +

Enable duplex printing (two pages per sheet of paper).

+ + + + + + +

−e

@@ -252,8 +291,8 @@ and non-zero to enable. The default is enabled.

Specify the size of overlapping for split images (in -inches). Used in conjunction with −H -option.

+inches). Used in conjunction with −H and −W +options.

@@ -309,6 +348,19 @@ are hidden using the SubIFD tag.

+

−O

+ + + + +

Write PostScript to specified file instead of standard output.

+ + + + + + +

−p

@@ -323,6 +375,19 @@ PostScript.

+

−P

+ + + + +

Set optional PageOrientation DSC comment to Landscape or Portrait.

+ + + + + + +

−r

@@ -350,6 +415,32 @@ file.

+

−t

+ + + + +

Specify the document title string.

+ + + + + + + +

−T

+ + + + +

Print pages for top edge binding.

+ + + + + + +

−w

@@ -364,6 +455,22 @@ inches).

+

−W

+ + + + +

Specify the maximum width of image (in inches). Images +with larger sizes will be split in several pages. Option +−L may be used for specifying size of split +images overlapping.

+ + + + + + +

−x

diff --git a/html/man/tiffcp.1.html b/html/man/tiffcp.1.html index 4c7fcb62..c0c7da0b 100644 --- a/html/man/tiffcp.1.html +++ b/html/man/tiffcp.1.html @@ -70,27 +70,33 @@ any way.

OPTIONS

+ cols="5" cellspacing="0" cellpadding="0"> - - -
-

−b image

- - + + + + + + - + + + -
+

−a

+		 + +

Append to an existing output file instead of overwriting it.

+		 +
+

−b

subtract the following monochrome image from all others processed. This can be used to remove a noise bias from a set of images. This bias image is typically an image of noise the camera saw with its shutter closed.

- - + @@ -260,6 +267,19 @@ images.

+ + + + + + @@ -355,6 +375,19 @@ in sequence.

+ + + + + +
+
@@ -135,8 +141,9 @@ output file: none for no compression, packbits for PackBits compression, lzw for Lempel-Ziv & Welch compression, jpeg for baseline JPEG compression, zip for Deflate compression, g3 -for CCITT Group 3 (T.4) compression, and g4 for CCITT -Group 4 (T.6) compression. By default tiffcp will +for CCITT Group 3 (T.4) compression, g4 for CCITT +Group 4 (T.6) compression, or sgilog for SGILOG compression. +By default tiffcp will compress data according to the value of the Compression tag found in the source file.

 +

−o

+		 + +

Set initial directory offset.

+		 +
+

−p
+ +

−8

+		 + +

Write BigTIFF instead of classic TIFF format.

+		 +
Fill- Order tag set to MSB2LSB + + + + + + diff --git a/man/tiff2ps.1 b/man/tiff2ps.1 index c3a9bacf..565e3ac5 100644 --- a/man/tiff2ps.1 +++ b/man/tiff2ps.1 @@ -1,4 +1,4 @@ -.\" $Id: tiff2ps.1,v 1.10 2009-01-12 02:05:19 bfriesen Exp $ +.\" $Id: tiff2ps.1,v 1.11 2013-03-06 03:35:09 tgl Exp $ .\" .\" Copyright (c) 1988-1997 Sam Leffler .\" Copyright (c) 1991-1997 Silicon Graphics, Inc. @@ -100,6 +100,9 @@ Generate \*(Ps Level 2. Generate \*(Ps Level 3. It basically allows one to use the /flateDecode filter for ZIP compressed TIFF images. .TP +.B \-8 +Disable use of ASCII85 encoding with \*(Ps Level 2/3. +.TP .B \-a Generate output for all IFDs (pages) in the input file. .TP @@ -115,6 +118,9 @@ and the .B \-h option are given. .TP +.B \-C +Specify the document creator name. +.TP .B \-d Set the initial .SM TIFF @@ -123,6 +129,9 @@ directory to the specified directory number. This option is useful for selecting individual pages in a multi-page (e.g. facsimile) file. .TP +.B \-D +Enable duplex printing (two pages per sheet of paper). +.TP .B \-e Force the generation of Encapsulated \*(Ps (implies .BR \-z ). @@ -135,14 +144,6 @@ Specify the maximum height of image (in inches). Images with larger sizes will be split in several pages. Option .B \-L may be used for specifying size of split images overlapping. -.TP -.B \-W -Specify the maximum width of image (in inches). Images with larger sizes will -be split in several pages. Options -.B \-L -and -.B \-W -are mutually exclusive. .B \-i Enable/disable pixel interpolation. This option requires a single numeric value: zero to disable pixel interpolation and @@ -152,9 +153,9 @@ non-zero to enable. The default is enabled. Specify the size of overlapping for split images (in inches). Used in conjunction with .B \-H -option and +and .B \-W -option. +options. .TP .B \-l Specify the left margin for the output (in inches). This does not affect @@ -185,9 +186,15 @@ like which are hidden using the .I SubIFD tag. .TP +.B \-O +Write \*(Ps to specified file instead of standard output. +.TP .B \-p Force the generation of (non-Encapsulated) \*(Ps. .TP +.B \-P L|P +Set optional PageOrientation DSC comment to Landscape or Portrait. +.TP .B \-r 90|180|270|auto Rotate image by 90, 180, 270 degrees or auto. Auto picks the best fit for the image on the specified paper size (eg portrait @@ -197,9 +204,23 @@ counterclockwise. Auto rotates 90 degrees ccw to produce landscape. .B \-s Generate output for a single IFD (page) in the input file. .TP +.B \-t +Specify the document title string. +.TP +.B \-T +Print pages for top edge binding. +.TP .B \-w Specify the horizontal size of the printed area (in inches). .TP +.B \-W +Specify the maximum width of image (in inches). Images with larger sizes will +be split in several pages. Options +.B \-L +and +.B \-W +are mutually exclusive. +.TP .B \-x Override resolution units specified in the TIFF as centimeters. .TP diff --git a/man/tiffcp.1 b/man/tiffcp.1 index 5fdcc474..0ed12dca 100644 --- a/man/tiffcp.1 +++ b/man/tiffcp.1 @@ -1,4 +1,4 @@ -.\" $Id: tiffcp.1,v 1.12 2010-12-23 13:38:47 dron Exp $ +.\" $Id: tiffcp.1,v 1.13 2013-03-06 03:35:09 tgl Exp $ .\" .\" Copyright (c) 1988-1997 Sam Leffler .\" Copyright (c) 1991-1997 Silicon Graphics, Inc. @@ -60,6 +60,9 @@ in a file, but it is explicitly intended to not alter or convert the image data content in any way. .SH OPTIONS .TP +.B \-a +Append to an existing output file instead of overwriting it. +.TP .BI \-b " image" subtract the following monochrome image from all others processed. This can be used to remove a noise bias @@ -91,9 +94,11 @@ for LZMA2 compression, for baseline JPEG compression, .B g3 for CCITT Group 3 (T.4) compression, -and .B g4 -for CCITT Group 4 (T.6) compression. +for CCITT Group 4 (T.6) compression, +or +.B sgilog +for SGILOG compression. By default .I tiffcp will compress data according to the value of the @@ -179,6 +184,9 @@ overwritten and not when it is appended to. .B \-M Suppress the use of memory-mapped files when reading images. .TP +.BI \-o " offset" +Set initial directory offset. +.TP .B \-p Specify the planar configuration to use in writing image data that has one 8-bit sample per pixel. @@ -228,6 +236,9 @@ appear in a tile. .B \-x Force the output file to be written with PAGENUMBER value in sequence. .TP +.B \-8 +Write BigTIFF instead of classic TIFF format. +.TP .BI \-,= character substitute .I character diff --git a/man/tiffdither.1 b/man/tiffdither.1 index ab0d32a7..c313fd6a 100644 --- a/man/tiffdither.1 +++ b/man/tiffdither.1 @@ -1,4 +1,4 @@ -.\" $Id: tiffdither.1,v 1.4 2006-04-20 12:17:19 dron Exp $ +.\" $Id: tiffdither.1,v 1.5 2013-03-06 03:35:09 tgl Exp $ .\" .\" Copyright (c) 1990-1997 Sam Leffler .\" Copyright (c) 1991-1997 Silicon Graphics, Inc. @@ -113,6 +113,9 @@ will force data to be written with the tag set to .SM MSB2LSB . .TP +.B \-r +Make each strip have no more than the given number of rows. +.TP .B \-t Set the threshold value for dithering. By default the threshold value is 128. diff --git a/tools/tiff2ps.c b/tools/tiff2ps.c index 041b7c4b..33307505 100644 --- a/tools/tiff2ps.c +++ b/tools/tiff2ps.c @@ -1,4 +1,4 @@ -/* $Id: tiff2ps.c,v 1.50 2013-01-26 02:24:05 bfriesen Exp $ */ +/* $Id: tiff2ps.c,v 1.51 2013-03-06 03:35:09 tgl Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -260,9 +260,9 @@ main(int argc, char* argv[]) case 'c': centered = 1; break; - case 'C': - creator = optarg; - break; + case 'C': + creator = optarg; + break; case 'd': /* without -a, this only processes one image at this IFD */ dirnum = atoi(optarg); break; @@ -3041,13 +3041,13 @@ char* stuff[] = { " -a convert all directories in file (default is first), Not EPS", " -b # set the bottom margin to # inches", " -c center image (-b and -l still add to this)", +" -C name set postscript document creator name", " -d # set initial directory to # counting from zero", " -D enable duplex printing (two pages per sheet of paper)", " -e generate Encapsulated PostScript (EPS) (implies -z)", " -h # set printed page height to # inches (no default)", " -w # set printed page width to # inches (no default)", " -H # split image if height is more than # inches", -" -P L or P set optional PageOrientation DSC comment to Landscape or Portrait", " -W # split image if width is more than # inches", " -L # overLap split images by # inches", " -i # enable/disable (Nz/0) pixel interpolation (default: enable)", @@ -3055,7 +3055,8 @@ char* stuff[] = { " -m use \"imagemask\" operator instead of \"image\"", " -o # convert directory at file offset # bytes", " -O file write PostScript to file instead of standard output", -" -p generate regular PostScript", +" -p generate regular (non-encapsulated) PostScript", +" -P L or P set optional PageOrientation DSC comment to Landscape or Portrait", " -r # or auto rotate by 90, 180, 270 degrees or auto", " -s generate PostScript for a single image", " -t name set postscript document title. Otherwise the filename is used", diff --git a/tools/tiffcp.c b/tools/tiffcp.c index 0f81b19d..53cf29a7 100644 --- a/tools/tiffcp.c +++ b/tools/tiffcp.c @@ -1,4 +1,4 @@ -/* $Id: tiffcp.c,v 1.49 2010-12-23 13:38:47 dron Exp $ */ +/* $Id: tiffcp.c,v 1.50 2013-03-06 03:35:09 tgl Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -173,7 +173,7 @@ main(int argc, char* argv[]) *mp++ = 'w'; *mp = '\0'; - while ((c = getopt(argc, argv, ",:b:c:f:l:o:z:p:r:w:aistBLMC8x")) != -1) + while ((c = getopt(argc, argv, ",:b:c:f:l:o:p:r:w:aistBLMC8x")) != -1) switch (c) { case ',': if (optarg[0] != '=') usage(); @@ -408,7 +408,12 @@ char* stuff[] = { " -p separate store samples separately (e.g. RRR...GGG...BBB...)", " -s write output in strips", " -t write output in tiles", +" -x force the merged tiff pages in sequence", " -8 write BigTIFF instead of default ClassicTIFF", +" -B write big-endian instead of native byte order", +" -L write little-endian instead of native byte order", +" -M disable use of memory-mapped files", +" -C disable strip chopping", " -i ignore read errors", " -b file[,#] bias (dark) monochrome image to be subtracted from all others", " -,=% use % rather than , to separate image #'s (per Note below)", @@ -430,7 +435,6 @@ char* stuff[] = { " -c g4 compress output with CCITT Group 4 encoding", " -c sgilog compress output with SGILOG encoding", " -c none use no compression algorithm on output", -" -x force the merged tiff pages in sequence", "", "Group 3 options:", " 1d use default CCITT Group 3 1D-encoding", diff --git a/tools/tiffdither.c b/tools/tiffdither.c index 3a377ac0..f2f0f20d 100644 --- a/tools/tiffdither.c +++ b/tools/tiffdither.c @@ -1,4 +1,4 @@ -/* $Id: tiffdither.c,v 1.12 2010-03-10 18:56:50 bfriesen Exp $ */ +/* $Id: tiffdither.c,v 1.13 2013-03-06 03:35:09 tgl Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -289,6 +289,7 @@ char* stuff[] = { "usage: tiffdither [options] input.tif output.tif", "where options are:", " -r # make each strip have no more than # rows", +" -t # set the threshold value for dithering (default 128)", " -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",
+

−r

+		 + +

Make each strip have no more than the given number of rows.

+		 +
+

−t