Update libtiff to 4.0.9

Add in portability changes to tiffiop.h

Portability tiffiop.h

Remove globals from tif_pixarlog.c

Tweaks to support libtiff 4.0.9

8 files changed, 6 insertions, 201 deletions

diff --git a/tiff/man/CMakeLists.txt b/tiff/man/CMakeLists.txt
index 1db7556d5..be5e2949e 100644
--- a/tiff/man/CMakeLists.txt
+++ b/tiff/man/CMakeLists.txt
@@ -28,8 +28,6 @@ set(man1_MANS
   pal2rgb.1
   ppm2tiff.1
   raw2tiff.1
-  rgb2ycbcr.1
-  thumbnail.1
   tiff2bw.1
   tiff2pdf.1
   tiff2ps.1
diff --git a/tiff/man/Makefile.am b/tiff/man/Makefile.am
index 08b8749b0..0fe9e4d08 100644
--- a/tiff/man/Makefile.am
+++ b/tiff/man/Makefile.am
@@ -29,8 +29,6 @@ dist_man1_MANS = \
 	pal2rgb.1 \
 	ppm2tiff.1 \
 	raw2tiff.1 \
-	rgb2ycbcr.1 \
-	thumbnail.1 \
 	tiff2bw.1 \
 	tiff2pdf.1 \
 	tiff2ps.1 \
diff --git a/tiff/man/Makefile.in b/tiff/man/Makefile.in
index 3f19b8c36..212905b64 100644
--- a/tiff/man/Makefile.in
+++ b/tiff/man/Makefile.in
@@ -335,8 +335,6 @@ dist_man1_MANS = \
 	pal2rgb.1 \
 	ppm2tiff.1 \
 	raw2tiff.1 \
-	rgb2ycbcr.1 \
-	thumbnail.1 \
 	tiff2bw.1 \
 	tiff2pdf.1 \
 	tiff2ps.1 \
diff --git a/tiff/man/TIFFGetField.3tiff b/tiff/man/TIFFGetField.3tiff
index bdf41a259..528019e15 100644
--- a/tiff/man/TIFFGetField.3tiff
+++ b/tiff/man/TIFFGetField.3tiff
@@ -1,4 +1,4 @@
-.\" $Id: TIFFGetField.3tiff,v 1.7 2016-09-25 20:05:49 bfriesen Exp $
+.\" $Id: TIFFGetField.3tiff,v 1.8 2017-06-30 17:40:02 erouault Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
@@ -160,7 +160,7 @@ TIFFTAG_STONITS	1	double**
 TIFFTAG_STRIPBYTECOUNTS	1	uint32**
 TIFFTAG_STRIPOFFSETS	1	uint32**
 TIFFTAG_SUBFILETYPE	1	uint32*
-TIFFTAG_SUBIFD	2	uint16*,uint32**	count & offsets array
+TIFFTAG_SUBIFD	2	uint16*,uint64**	count & offsets array
 TIFFTAG_TARGETPRINTER	1	char**
 TIFFTAG_THRESHHOLDING	1	uint16*
 TIFFTAG_TILEBYTECOUNTS	1	uint32**
diff --git a/tiff/man/TIFFSetDirectory.3tiff b/tiff/man/TIFFSetDirectory.3tiff
index 93faf1930..0f109f66a 100644
--- a/tiff/man/TIFFSetDirectory.3tiff
+++ b/tiff/man/TIFFSetDirectory.3tiff
@@ -1,4 +1,4 @@
-.\" $Id: TIFFSetDirectory.3tiff,v 1.3 2016-09-25 20:05:50 bfriesen Exp $
+.\" $Id: TIFFSetDirectory.3tiff,v 1.4 2017-06-30 17:40:02 erouault Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
@@ -33,7 +33,7 @@ file
 .sp
 .BI "int TIFFSetDirectory(TIFF *" tif ", tdir_t " dirnum ")"
 .br
-.BI "int TIFFSetSubDirectory(TIFF *" tif ", uint32 " diroff ")"
+.BI "int TIFFSetSubDirectory(TIFF *" tif ", uint64 " diroff ")"
 .SH DESCRIPTION
 .I TIFFSetDirectory
 changes the current directory and reads its contents with
diff --git a/tiff/man/TIFFSetField.3tiff b/tiff/man/TIFFSetField.3tiff
index 1754827cc..695a199e7 100644
--- a/tiff/man/TIFFSetField.3tiff
+++ b/tiff/man/TIFFSetField.3tiff
@@ -1,4 +1,4 @@
-.\" $Id: TIFFSetField.3tiff,v 1.6 2016-09-25 20:05:50 bfriesen Exp $
+.\" $Id: TIFFSetField.3tiff,v 1.7 2017-06-30 17:40:02 erouault Exp $
 .\"
 .\" Copyright (c) 1988-1997 Sam Leffler
 .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
@@ -157,7 +157,7 @@ TIFFTAG_SMINSAMPLEVALUE	1	double
 TIFFTAG_SOFTWARE	1	char*
 TIFFTAG_STONITS	1	double	\(dg
 TIFFTAG_SUBFILETYPE	1	uint32
-TIFFTAG_SUBIFD	2	uint16,uint32*	count & offsets array
+TIFFTAG_SUBIFD	2	uint16,uint64*	count & offsets array
 TIFFTAG_TARGETPRINTER	1	char*
 TIFFTAG_THRESHHOLDING	1	uint16
 TIFFTAG_TILEDEPTH	1	uint32	\(dg
diff --git a/tiff/man/rgb2ycbcr.1 b/tiff/man/rgb2ycbcr.1
deleted file mode 100644
index e3be491e9..000000000
--- a/tiff/man/rgb2ycbcr.1
+++ /dev/null
@@ -1,99 +0,0 @@
-.\"	$Header: /cvs/maptools/cvsroot/libtiff/man/rgb2ycbcr.1,v 1.5 2016-09-25 20:05:51 bfriesen Exp $
-.\"
-.\" Copyright (c) 1991-1997 Sam Leffler
-.\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
-.\"
-.\" Permission to use, copy, modify, distribute, and sell this software and 
-.\" its documentation for any purpose is hereby granted without fee, provided
-.\" that (i) the above copyright notices and this permission notice appear in
-.\" all copies of the software and related documentation, and (ii) the names of
-.\" Sam Leffler and Silicon Graphics may not be used in any advertising or
-.\" publicity relating to the software without the specific, prior written
-.\" permission of Sam Leffler and Silicon Graphics.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
-.\" EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
-.\" WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
-.\" 
-.\" IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-.\" ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-.\" OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-.\" WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
-.\" LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
-.\" OF THIS SOFTWARE.
-.\"
-.if n .po 0
-.TH RGB2YCBCR 1 "November 2, 2005" "libtiff"
-.SH NAME
-rgb2ycbcr \- convert non-YCbCr
-.SM TIFF
-images to a YCbCr
-.SM TIFF
-image
-.SH SYNOPSIS
-.B rgb2ycbcr
-[
-.I options
-]
-.I "src1.tif src2.tif ... dst.tif"
-.SH DESCRIPTION
-.I rgb2ycbcr
-converts
-.SM RGB
-color, greyscale, or bi-level
-.SM TIFF
-images to YCbCr images by transforming and sampling pixel data. If multiple
-files are specified on the command line each source file is converted to a
-separate directory in the destination file.
-.PP
-By default, chrominance samples are created by sampling
-2 by 2 blocks of luminance values; this can be changed with the
-.B \-h
-and
-.B \-v
-options.
-Output data are compressed with the
-.SM PackBits
-compression scheme, by default; an alternate scheme can be selected with the
-.B \-c
-option.
-By default, output data are compressed in strips with
-the number of rows in each strip selected so that the
-size of a strip is never more than 8 kilobytes;
-the
-.B \-r
-option can be used to explicitly set the number of
-rows per strip.
-.SH OPTIONS
-.TP
-.B \-c
-Specify a compression scheme to use when writing image data:
-.B "\-c none"
-for no compression,
-.B "\-c packbits"
-for the PackBits compression algorithm (the default),
-.B "\-c jpeg"
-for the JPEG compression algorithm,
-.B "\-c zip"
-for the deflate compression algorithm,
-and
-.B "\-c lzw"
-for Lempel-Ziv & Welch.
-.TP
-.B \-h
-Set the horizontal sampling dimension to one of: 1, 2 (default), or 4.
-.TP
-.B \-r
-Write data with a specified number of rows per strip;
-by default the number of rows/strip is selected so that each strip
-is approximately 8 kilobytes.
-.TP
-.B \-v
-Set the vertical sampling dimension to one of: 1, 2 (default), or 4.
-.SH "SEE ALSO"
-.BR tiffinfo (1),
-.BR tiffcp (1),
-.BR libtiff (3)
-.PP
-Libtiff library home page:
-.BR http://www.simplesystems.org/libtiff
diff --git a/tiff/man/thumbnail.1 b/tiff/man/thumbnail.1
deleted file mode 100644
index 5ae87eda7..000000000
--- a/tiff/man/thumbnail.1
+++ /dev/null
@@ -1,90 +0,0 @@
-.\"	$Id: thumbnail.1,v 1.3 2016-09-25 20:05:51 bfriesen Exp $
-.\"
-.\" Copyright (c) 1994-1997 Sam Leffler
-.\" Copyright (c) 1994-1997 Silicon Graphics, Inc.
-.\"
-.\" Permission to use, copy, modify, distribute, and sell this software and 
-.\" its documentation for any purpose is hereby granted without fee, provided
-.\" that (i) the above copyright notices and this permission notice appear in
-.\" all copies of the software and related documentation, and (ii) the names of
-.\" Sam Leffler and Silicon Graphics may not be used in any advertising or
-.\" publicity relating to the software without the specific, prior written
-.\" permission of Sam Leffler and Silicon Graphics.
-.\" 
-.\" THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
-.\" EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
-.\" WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
-.\" 
-.\" IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
-.\" ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
-.\" OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-.\" WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
-.\" LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
-.\" OF THIS SOFTWARE.
-.\"
-.if n .po 0
-.TH THUMBNAIL 1 "November 2, 2005" "libtiff"
-.SH NAME
-thumbnail \- create a
-.SM TIFF
-file with thumbnail images
-.SH SYNOPSIS
-.B thumbnail
-[
-.I options
-]
-.I input.tif
-.I output.tif
-.SH DESCRIPTION
-.I thumbnail
-is a program written to show how one might use the
-SubIFD tag (#330) to store thumbnail images.
-.I thumbnail
-copies a
-.SM TIFF
-Class F facsimile file to the output file
-and for each image an 8-bit greyscale 
-.IR "thumbnail sketch" .
-The output file contains the thumbnail image with the associated
-full-resolution page linked below with the SubIFD tag.
-.PP
-By default, thumbnail images are 216 pixels wide by 274 pixels high.
-Pixels are calculated by sampling and filtering the input image
-with each pixel value passed through a contrast curve.
-.SH OPTIONS
-.TP
-.B \-w
-Specify the width of thumbnail images in pixels.
-.TP
-.B \-h
-Specify the height of thumbnail images in pixels.
-.TP
-.B \-c
-Specify a contrast curve to apply in generating the thumbnail images.
-By default pixels values are passed through a linear contrast curve
-that simply maps the pixel value ranges.
-Alternative curves are:
-.B exp50
-for a 50% exponential curve,
-.B exp60
-for a 60% exponential curve,
-.B exp70
-for a 70% exponential curve,
-.B exp80
-for a 80% exponential curve,
-.B exp90
-for a 90% exponential curve,
-.B exp
-for a pure exponential curve,
-.B linear
-for a linear curve.
-.SH BUGS
-There are no options to control the format of the saved thumbnail images.
-.SH "SEE ALSO"
-.BR tiffdump (1),
-.BR tiffgt (1),
-.BR tiffinfo (1),
-.BR libtiff (3)
-.PP
-Libtiff library home page:
-.BR http://www.simplesystems.org/libtiff/