summaryrefslogtreecommitdiff
path: root/tiff/man
diff options
context:
space:
mode:
Diffstat (limited to 'tiff/man')
-rw-r--r--tiff/man/Makefile.in4
-rw-r--r--tiff/man/TIFFGetField.3tiff62
-rw-r--r--tiff/man/TIFFReadEncodedStrip.3tiff2
-rw-r--r--tiff/man/TIFFstrip.3tiff6
-rw-r--r--tiff/man/tiff2pdf.13
-rw-r--r--tiff/man/tiff2ps.14
-rw-r--r--tiff/man/tiff2rgba.14
-rw-r--r--tiff/man/tiffcp.115
-rw-r--r--tiff/man/tiffcrop.14
9 files changed, 67 insertions, 37 deletions
diff --git a/tiff/man/Makefile.in b/tiff/man/Makefile.in
index f5c9bf0c4..4568bfe79 100644
--- a/tiff/man/Makefile.in
+++ b/tiff/man/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.2 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/tiff/man/TIFFGetField.3tiff b/tiff/man/TIFFGetField.3tiff
index c2fd025f6..431f4ae9b 100644
--- a/tiff/man/TIFFGetField.3tiff
+++ b/tiff/man/TIFFGetField.3tiff
@@ -22,7 +22,7 @@
.\" OF THIS SOFTWARE.
.\"
.if n .po 0
-.TH TIFFGetField 3TIFF "March 18, 2005" "libtiff"
+.TH TIFFGetField 3TIFF "March 29, 2020" "libtiff"
.SH NAME
TIFFGetField, TIFFVGetField \- get the value(s) of a tag in an open
.SM TIFF
@@ -102,77 +102,77 @@ meaning of each tag and their possible values.
.ta \w'TIFFTAG_CONSECUTIVEBADFAXLINES'u+2n +\w'Count'u+2n +\w'TIFFFaxFillFunc*'u+2n
\fITag Name\fP \fICount\fP \fITypes\fP \fINotes\fP
.sp 5p
-TIFFTAG_ARTIST 1 char**
+TIFFTAG_ARTIST 1 const char**
TIFFTAG_BADFAXLINES 1 uint32*
TIFFTAG_BITSPERSAMPLE 1 uint16*
TIFFTAG_CLEANFAXDATA 1 uint16*
-TIFFTAG_COLORMAP 3 uint16** 1<<BitsPerSample arrays
+TIFFTAG_COLORMAP 3 const uint16** 1<<BitsPerSample arrays
TIFFTAG_COMPRESSION 1 uint16*
TIFFTAG_CONSECUTIVEBADFAXLINES 1 uint32*
-TIFFTAG_COPYRIGHT 1 char**
+TIFFTAG_COPYRIGHT 1 const char**
TIFFTAG_DATATYPE 1 uint16*
-TIFFTAG_DATETIME 1 char**
-TIFFTAG_DOCUMENTNAME 1 char**
+TIFFTAG_DATETIME 1 const char**
+TIFFTAG_DOCUMENTNAME 1 const char**
TIFFTAG_DOTRANGE 2 uint16*
-TIFFTAG_EXTRASAMPLES 2 uint16*,uint16** count & types array
+TIFFTAG_EXTRASAMPLES 2 uint16*,const uint16** count & types array
TIFFTAG_FAXFILLFUNC 1 TIFFFaxFillFunc* G3/G4 compression pseudo-tag
TIFFTAG_FAXMODE 1 int* G3/G4 compression pseudo-tag
TIFFTAG_FILLORDER 1 uint16*
TIFFTAG_GROUP3OPTIONS 1 uint32*
TIFFTAG_GROUP4OPTIONS 1 uint32*
TIFFTAG_HALFTONEHINTS 2 uint16*
-TIFFTAG_HOSTCOMPUTER 1 char**
-TIFFTAG_ICCPROFILE 2 uint32*,void** count, profile data
+TIFFTAG_HOSTCOMPUTER 1 const char**
+TIFFTAG_ICCPROFILE 2 const uint32*,const void** count, profile data
TIFFTAG_IMAGEDEPTH 1 uint32*
-TIFFTAG_IMAGEDESCRIPTION 1 char**
+TIFFTAG_IMAGEDESCRIPTION 1 const char**
TIFFTAG_IMAGELENGTH 1 uint32*
TIFFTAG_IMAGEWIDTH 1 uint32*
-TIFFTAG_INKNAMES 1 char**
+TIFFTAG_INKNAMES 1 const char**
TIFFTAG_INKSET 1 uint16*
TIFFTAG_JPEGCOLORMODE 1 int* JPEG pseudo-tag
TIFFTAG_JPEGQUALITY 1 int* JPEG pseudo-tag
-TIFFTAG_JPEGTABLES 2 uint32*,void** count & tables
+TIFFTAG_JPEGTABLES 2 uint32*,const void** count & tables
TIFFTAG_JPEGTABLESMODE 1 int* JPEG pseudo-tag
-TIFFTAG_MAKE 1 char**
+TIFFTAG_MAKE 1 const char**
TIFFTAG_MATTEING 1 uint16*
TIFFTAG_MAXSAMPLEVALUE 1 uint16*
TIFFTAG_MINSAMPLEVALUE 1 uint16*
-TIFFTAG_MODEL 1 char**
+TIFFTAG_MODEL 1 const char**
TIFFTAG_ORIENTATION 1 uint16*
-TIFFTAG_PAGENAME 1 char**
+TIFFTAG_PAGENAME 1 const char**
TIFFTAG_PAGENUMBER 2 uint16*
TIFFTAG_PHOTOMETRIC 1 uint16*
-TIFFTAG_PHOTOSHOP 2 uint32*,void** count, data
+TIFFTAG_PHOTOSHOP 2 uint32*,const void** count, data
TIFFTAG_PLANARCONFIG 1 uint16*
TIFFTAG_PREDICTOR 1 uint16*
-TIFFTAG_PRIMARYCHROMATICITIES 1 float** 6-entry array
-TIFFTAG_REFERENCEBLACKWHITE 1 float** 6-entry array
+TIFFTAG_PRIMARYCHROMATICITIES 1 const float** 6-entry array
+TIFFTAG_REFERENCEBLACKWHITE 1 const float** 6-entry array
TIFFTAG_RESOLUTIONUNIT 1 uint16*
-TIFFTAG_RICHTIFFIPTC 2 uint32*,void** count, data
+TIFFTAG_RICHTIFFIPTC 2 uint32*,const void** count, data
TIFFTAG_ROWSPERSTRIP 1 uint32*
TIFFTAG_SAMPLEFORMAT 1 uint16*
TIFFTAG_SAMPLESPERPIXEL 1 uint16*
TIFFTAG_SMAXSAMPLEVALUE 1 double*
TIFFTAG_SMINSAMPLEVALUE 1 double*
-TIFFTAG_SOFTWARE 1 char**
-TIFFTAG_STONITS 1 double**
-TIFFTAG_STRIPBYTECOUNTS 1 uint32**
-TIFFTAG_STRIPOFFSETS 1 uint32**
+TIFFTAG_SOFTWARE 1 const char**
+TIFFTAG_STONITS 1 const double**
+TIFFTAG_STRIPBYTECOUNTS 1 const uint64**
+TIFFTAG_STRIPOFFSETS 1 const uint64**
TIFFTAG_SUBFILETYPE 1 uint32*
-TIFFTAG_SUBIFD 2 uint16*,uint64** count & offsets array
-TIFFTAG_TARGETPRINTER 1 char**
+TIFFTAG_SUBIFD 2 uint16*,const uint64** count & offsets array
+TIFFTAG_TARGETPRINTER 1 const char**
TIFFTAG_THRESHHOLDING 1 uint16*
-TIFFTAG_TILEBYTECOUNTS 1 uint32**
+TIFFTAG_TILEBYTECOUNTS 1 const uint64**
TIFFTAG_TILEDEPTH 1 uint32*
TIFFTAG_TILELENGTH 1 uint32*
-TIFFTAG_TILEOFFSETS 1 uint32**
+TIFFTAG_TILEOFFSETS 1 const uint64**
TIFFTAG_TILEWIDTH 1 uint32*
-TIFFTAG_TRANSFERFUNCTION 1 or 3\(dg uint16**1<<BitsPerSample entry arrays
-TIFFTAG_WHITEPOINT 1 float** 2-entry array
-TIFFTAG_XMLPACKET 2 uint32*,void** count, data
+TIFFTAG_TRANSFERFUNCTION 1 or 3\(dg const uint16**1<<BitsPerSample entry arrays
+TIFFTAG_WHITEPOINT 1 const float** 2-entry array
+TIFFTAG_XMLPACKET 2 uint32*,const void** count, data
TIFFTAG_XPOSITION 1 float*
TIFFTAG_XRESOLUTION 1 float*
-TIFFTAG_YCBCRCOEFFICIENTS 1 float** 3-entry array
+TIFFTAG_YCBCRCOEFFICIENTS 1 const float** 3-entry array
TIFFTAG_YCBCRPOSITIONING 1 uint16*
TIFFTAG_YCBCRSUBSAMPLING 2 uint16*
TIFFTAG_YPOSITION 1 float*
diff --git a/tiff/man/TIFFReadEncodedStrip.3tiff b/tiff/man/TIFFReadEncodedStrip.3tiff
index 7122946a4..05ddefb94 100644
--- a/tiff/man/TIFFReadEncodedStrip.3tiff
+++ b/tiff/man/TIFFReadEncodedStrip.3tiff
@@ -30,7 +30,7 @@ file
.SH SYNOPSIS
.B "#include <tiffio.h>"
.sp
-.BI "tsize_t TIFFReadEncodedStrip(TIFF *" tif ", tstrip_t " strip ", tdata_t " buf ", tsize_t " size ")"
+.BI "tmsize_t TIFFReadEncodedStrip(TIFF *" tif ", uint32 " strip ", void *" buf ", tmsize_t " size ")"
.SH DESCRIPTION
Read the specified strip of data and place up to
.I size
diff --git a/tiff/man/TIFFstrip.3tiff b/tiff/man/TIFFstrip.3tiff
index eb38318fd..ce3f718c1 100644
--- a/tiff/man/TIFFstrip.3tiff
+++ b/tiff/man/TIFFstrip.3tiff
@@ -31,11 +31,11 @@ TIFFComputeStrip, TIFFNumberOfStrips \- strip-related utility routines
.sp
.BI "uint32 TIFFDefaultStripSize(TIFF *" tif ", uint32 " estimate ")"
.br
-.BI "tsize_t TIFFStripSize(TIFF *" tif ")"
+.BI "tmsize_t TIFFStripSize(TIFF *" tif ")"
.br
-.BI "tsize_t TIFFVStripSize(TIFF *" tif ", uint32 " nrows ")"
+.BI "tmsize_t TIFFVStripSize(TIFF *" tif ", uint32 " nrows ")"
.br
-.BI "tsize_t TIFFRawStripSize(TIFF *" tif ", tstrip_t " strip ")"
+.BI "tmsize_t TIFFRawStripSize(TIFF *" tif ", uint32 " strip ")"
.br
.BI "tstrip_t TIFFComputeStrip(TIFF *" tif ", uint32 " row ", tsample_t " sample ")"
.br
diff --git a/tiff/man/tiff2pdf.1 b/tiff/man/tiff2pdf.1
index 930113326..6b3b4abf5 100644
--- a/tiff/man/tiff2pdf.1
+++ b/tiff/man/tiff2pdf.1
@@ -212,6 +212,9 @@ Set document information subject, overrides image image description default.
.BI \-k " keywords"
Set document information keywords.
.TP
+.BI \-m " size"
+Set memory allocation limit (in MiB). Default is 256MiB. Set to 0 to disable the limit.
+.TP
.B \-h
List usage reminder to stderr and exit.
.SH EXAMPLES
diff --git a/tiff/man/tiff2ps.1 b/tiff/man/tiff2ps.1
index 5e2b9a857..ce323eeeb 100644
--- a/tiff/man/tiff2ps.1
+++ b/tiff/man/tiff2ps.1
@@ -160,6 +160,10 @@ options.
Specify the left margin for the output (in inches). This does not affect
the width of the printed image.
.TP
+.BI \-M " size"
+Set maximum memory allocation size (in MiB). The default is 256MiB.
+Set to 0 to disable the limit.
+.TP
.B \-m
Where possible render using the
.I imagemask
diff --git a/tiff/man/tiff2rgba.1 b/tiff/man/tiff2rgba.1
index d9c9baae8..fe9ebb2c6 100644
--- a/tiff/man/tiff2rgba.1
+++ b/tiff/man/tiff2rgba.1
@@ -87,6 +87,10 @@ Drop the alpha component from the output file, producing a pure RGB file.
Currently this does not work if the
.B \-b
flag is also in effect.
+.TP
+.BI \-M " size"
+Set maximum memory allocation size (in MiB). The default is 256MiB.
+Set to 0 to disable the limit.
.SH "SEE ALSO"
.BR tiff2bw (1),
.BR TIFFReadRGBAImage (3t),
diff --git a/tiff/man/tiffcp.1 b/tiff/man/tiffcp.1
index 0545686c2..6bfee3486 100644
--- a/tiff/man/tiffcp.1
+++ b/tiff/man/tiffcp.1
@@ -151,6 +151,17 @@ e.g.
for
.SM Deflate
encoding with maximum compression level and floating point predictor.
+.IP
+For the
+.SM Deflate
+codec, and in a libtiff build with libdeflate enabled, ``p12`` is
+actually the maximum level.
+.IP
+For the
+.SM Deflate
+codec, and in a libtiff build with libdeflate enabled, ``s0`` can be used to
+require zlib to be used, and ``s1`` for libdeflate (defaults to libdeflate when
+it is available).
.TP
.B \-f
Specify the bit fill order to use in writing output data.
@@ -247,6 +258,10 @@ Note that
.B \-,=
with whitespace immediately following will disable
the special meaning of the `,' entirely. See examples.
+.TP
+.BI \-m " size"
+Set maximum memory allocation size (in MiB). The default is 256MiB.
+Set to 0 to disable the limit.
.SH EXAMPLES
The following concatenates two files and writes the result using
.SM LZW
diff --git a/tiff/man/tiffcrop.1 b/tiff/man/tiffcrop.1
index 5bd009765..d7a4c4d74 100644
--- a/tiff/man/tiffcrop.1
+++ b/tiff/man/tiffcrop.1
@@ -350,6 +350,10 @@ will force data to be written with the FillOrder tag set to
.TP
.B \-i
Ignore non\-fatal read errors and continue processing of the input file.
+.TP
+.B "\-k size"
+Set maximum memory allocation size (in MiB). The default is 256MiB.
+Set to 0 to disable the limit.
.TP
.B \-l
Specify the length of a tile (in pixels).
View Lorry Controller Status