diff --git a/.gitignore b/.gitignore
index 7772353..d6f4142 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/tiff-4.0.2.tar.gz
+/tiff-4.0.3.tar.gz
diff --git a/libtiff-4.0.2-bigendian.patch b/libtiff-4.0.2-bigendian.patch
deleted file mode 100644
index 0832254..0000000
--- a/libtiff-4.0.2-bigendian.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up tiff-4.0.2/test/raw_decode.c.bigendian tiff-4.0.2/test/raw_decode.c
---- tiff-4.0.2/test/raw_decode.c.bigendian 2012-07-03 15:27:37.168543695 +0200
-+++ tiff-4.0.2/test/raw_decode.c 2012-07-03 15:28:47.795051599 +0200
-@@ -85,9 +85,9 @@ static int check_rgb_pixel( int pixel, i
- static int check_rgba_pixel( int pixel, int red, int green, int blue, int alpha, unsigned char *buffer ) {
- /* RGBA images are upside down - adjust for normal ordering */
- int adjusted_pixel = pixel % 128 + (127 - (pixel/128)) * 128;
-- unsigned char *rgba = buffer + 4 * adjusted_pixel;
-+ unsigned int *rgba = (unsigned int*)(buffer + 4 * adjusted_pixel);
-
-- if( rgba[0] == red && rgba[1] == green && rgba[2] == blue && rgba[3] == alpha ) {
-+ if( TIFFGetR(*rgba) == red && TIFFGetG(*rgba) == green && TIFFGetB(*rgba) == blue && TIFFGetA(*rgba) == alpha ) {
- return 0;
- }
-
diff --git a/libtiff-CVE-2012-3401.patch b/libtiff-CVE-2012-3401.patch
deleted file mode 100644
index 847bd0d..0000000
--- a/libtiff-CVE-2012-3401.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur tiff-4.0.2.orig/tools/tiff2pdf.c tiff-4.0.2/tools/tiff2pdf.c
---- tiff-4.0.2.orig/tools/tiff2pdf.c 2012-06-15 17:51:54.000000000 -0400
-+++ tiff-4.0.2/tools/tiff2pdf.c 2012-07-05 13:34:36.569691068 -0400
-@@ -1066,6 +1066,7 @@
- "Can't set directory %u of input file %s",
- i,
- TIFFFileName(input));
-+ t2p->t2p_error = T2P_ERR_ERROR;
- return;
- }
- if(TIFFGetField(input, TIFFTAG_PAGENUMBER, &pagen, &paged)){
diff --git a/libtiff-accessors.patch b/libtiff-accessors.patch
deleted file mode 100644
index e24600e..0000000
--- a/libtiff-accessors.patch
+++ /dev/null
@@ -1,1372 +0,0 @@
-Upstream patch to add accessor functions for the now-opaque struct TIFFField.
-Normally we'd just wait for 4.0.3 to have these, but I'd like to get freeimage
-fixed without waiting for upstream to do a release.
-
-
-diff -Naur tiff-4.0.2.orig/configure.com tiff-4.0.2/configure.com
---- tiff-4.0.2.orig/configure.com 2007-11-23 05:01:34.000000000 -0500
-+++ tiff-4.0.2/configure.com 2012-07-29 13:28:51.048258582 -0400
-@@ -1,4 +1,4 @@
--$! $Id: configure.com,v 1.2 2007-11-23 10:01:34 dron Exp $
-+$! $Id: configure.com,v 1.3 2012-07-29 15:45:29 tgl Exp $
- $!
- $! OpenVMS configure procedure for libtiff
- $! (c) Alexey Chupahin 22-NOV-2007
-@@ -503,6 +503,12 @@
- TIFFFindFieldInfoByName=PROCEDURE,-
- TIFFFieldWithName=PROCEDURE,-
- TIFFFieldWithTag=PROCEDURE,-
-+TIFFFieldTag=PROCEDURE,-
-+TIFFFieldName=PROCEDURE,-
-+TIFFFieldDataType=PROCEDURE,-
-+TIFFFieldPassCount=PROCEDURE,-
-+TIFFFieldReadCount=PROCEDURE,-
-+TIFFFieldWriteCount=PROCEDURE,-
- TIFFCurrentDirOffset=PROCEDURE,-
- TIFFWriteCheck=PROCEDURE,-
- TIFFRGBAImageOK=PROCEDURE,-
-@@ -648,6 +654,12 @@
- UNIVERSAL=TIFFFindFieldInfoByName
- UNIVERSAL=TIFFFieldWithName
- UNIVERSAL=TIFFFieldWithTag
-+UNIVERSAL=TIFFFieldTag
-+UNIVERSAL=TIFFFieldName
-+UNIVERSAL=TIFFFieldDataType
-+UNIVERSAL=TIFFFieldPassCount
-+UNIVERSAL=TIFFFieldReadCount
-+UNIVERSAL=TIFFFieldWriteCount
- UNIVERSAL=TIFFCurrentDirOffset
- UNIVERSAL=TIFFWriteCheck
- UNIVERSAL=TIFFRGBAImageOK
-diff -Naur tiff-4.0.2.orig/html/man/Makefile.am tiff-4.0.2/html/man/Makefile.am
---- tiff-4.0.2.orig/html/man/Makefile.am 2007-07-13 10:57:41.000000000 -0400
-+++ tiff-4.0.2/html/man/Makefile.am 2012-07-29 13:28:51.049258558 -0400
-@@ -39,6 +39,12 @@
- TIFFcolor.3tiff.html \
- TIFFDataWidth.3tiff.html \
- TIFFError.3tiff.html \
-+ TIFFFieldDataType.3tiff.html \
-+ TIFFFieldName.3tiff.html \
-+ TIFFFieldPassCount.3tiff.html \
-+ TIFFFieldReadCount.3tiff.html \
-+ TIFFFieldTag.3tiff.html \
-+ TIFFFieldWriteCount.3tiff.html \
- TIFFFlush.3tiff.html \
- TIFFGetField.3tiff.html \
- TIFFmemory.3tiff.html \
-diff -Naur tiff-4.0.2.orig/html/man/TIFFFieldDataType.3tiff.html tiff-4.0.2/html/man/TIFFFieldDataType.3tiff.html
---- tiff-4.0.2.orig/html/man/TIFFFieldDataType.3tiff.html 1969-12-31 19:00:00.000000000 -0500
-+++ tiff-4.0.2/html/man/TIFFFieldDataType.3tiff.html 2012-07-29 13:28:51.050258537 -0400
-@@ -0,0 +1,89 @@
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+TIFFFieldDataType
-+
-+
-+
-+
-+TIFFFieldDataType
-+
-+NAME
-+SYNOPSIS
-+DESCRIPTION
-+RETURN VALUES
-+SEE ALSO
-+
-+
-+
-+
-+NAME
-+
-+
-+
-+
-+
-+TIFFFieldDataType
-+− Get TIFF data type from field information
-+
-+SYNOPSIS
-+
-+
-+
-+
-+#include
-+<tiffio.h>
-+
-+
-+TIFFDataType
-+TIFFFieldDataType(const TIFFField*
-+fip)
-+
-+DESCRIPTION
-+
-+
-+
-+
-+
-+TIFFFieldDataType
-+returns the data type stored in a TIFF field.
-+
-+fip is a
-+field information pointer previously returned by
-+TIFFFindField, TIFFFieldWithTag, or
-+TIFFFieldWithName.
-+
-+RETURN VALUES
-+
-+
-+
-+
-+
-+TIFFFieldDataType
-+returns a member of the enum type TIFFDataType.
-+
-+SEE ALSO
-+
-+
-+
-+
-+
-+libtiff(3TIFF),
-+
-+Libtiff library
-+home page: http://www.remotesensing.org/libtiff/
-+
-+
-+
-diff -Naur tiff-4.0.2.orig/html/man/TIFFFieldName.3tiff.html tiff-4.0.2/html/man/TIFFFieldName.3tiff.html
---- tiff-4.0.2.orig/html/man/TIFFFieldName.3tiff.html 1969-12-31 19:00:00.000000000 -0500
-+++ tiff-4.0.2/html/man/TIFFFieldName.3tiff.html 2012-07-29 13:28:51.050258537 -0400
-@@ -0,0 +1,86 @@
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+TIFFFieldName
-+
-+
-+
-+
-+TIFFFieldName
-+
-+NAME
-+SYNOPSIS
-+DESCRIPTION
-+RETURN VALUES
-+SEE ALSO
-+
-+
-+
-+
-+NAME
-+
-+
-+
-+
-+TIFFFieldName
-+− Get TIFF field name from field information
-+
-+SYNOPSIS
-+
-+
-+
-+
-+#include
-+<tiffio.h>
-+
-+const char*
-+TIFFFieldName(const TIFFField* fip)
-+
-+DESCRIPTION
-+
-+
-+
-+
-+
-+TIFFFieldName
-+returns the textual name for a TIFF field.
-+
-+fip is a
-+field information pointer previously returned by
-+TIFFFindField, TIFFFieldWithTag, or
-+TIFFFieldWithName.
-+
-+RETURN VALUES
-+
-+
-+
-+
-+
-+TIFFFieldName
-+returns a constant C string.
-+
-+SEE ALSO
-+
-+
-+
-+
-+
-+libtiff(3TIFF),
-+
-+Libtiff library
-+home page: http://www.remotesensing.org/libtiff/
-+
-+
-+
-diff -Naur tiff-4.0.2.orig/html/man/TIFFFieldPassCount.3tiff.html tiff-4.0.2/html/man/TIFFFieldPassCount.3tiff.html
---- tiff-4.0.2.orig/html/man/TIFFFieldPassCount.3tiff.html 1969-12-31 19:00:00.000000000 -0500
-+++ tiff-4.0.2/html/man/TIFFFieldPassCount.3tiff.html 2012-07-29 13:28:51.050258537 -0400
-@@ -0,0 +1,98 @@
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+TIFFFieldPassCount
-+
-+
-+
-+
-+TIFFFieldPassCount
-+
-+NAME
-+SYNOPSIS
-+DESCRIPTION
-+RETURN VALUES
-+SEE ALSO
-+
-+
-+
-+
-+NAME
-+
-+
-+
-+
-+
-+TIFFFieldPassCount
-+− Get whether to pass a count to TIFFGet/SetField
-+
-+SYNOPSIS
-+
-+
-+
-+
-+#include
-+<tiffio.h>
-+
-+int
-+TIFFFieldPassCount(const TIFFField*
-+fip)
-+
-+DESCRIPTION
-+
-+
-+
-+
-+
-+TIFFFieldPassCount
-+returns true (nonzero) if TIFFGetField and
-+TIFFSetField expect a count value to be passed
-+before the actual data pointer.
-+
-+fip is a
-+field information pointer previously returned by
-+TIFFFindField, TIFFFieldWithTag, or
-+TIFFFieldWithName.
-+
-+When a
-+count is required, it will be of type uint32
-+when TIFFFieldReadCount reports
-+TIFF_VARIABLE2, and of type uint16 otherwise.
-+(This distinction is critical for use of
-+TIFFGetField, but normally not so for use of
-+TIFFSetField.)
-+
-+RETURN VALUES
-+
-+
-+
-+
-+
-+TIFFFieldPassCount
-+returns an integer that is always 1 (true) or 0 (false).
-+
-+SEE ALSO
-+
-+
-+
-+
-+
-+libtiff(3TIFF),
-+
-+Libtiff library
-+home page: http://www.remotesensing.org/libtiff/
-+
-+
-+
-diff -Naur tiff-4.0.2.orig/html/man/TIFFFieldReadCount.3tiff.html tiff-4.0.2/html/man/TIFFFieldReadCount.3tiff.html
---- tiff-4.0.2.orig/html/man/TIFFFieldReadCount.3tiff.html 1969-12-31 19:00:00.000000000 -0500
-+++ tiff-4.0.2/html/man/TIFFFieldReadCount.3tiff.html 2012-07-29 13:28:51.051258516 -0400
-@@ -0,0 +1,101 @@
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+TIFFFieldReadCount
-+
-+
-+
-+
-+TIFFFieldReadCount
-+
-+NAME
-+SYNOPSIS
-+DESCRIPTION
-+RETURN VALUES
-+SEE ALSO
-+
-+
-+
-+
-+NAME
-+
-+
-+
-+
-+
-+TIFFFieldReadCount
-+− Get number of values to be read from field
-+
-+SYNOPSIS
-+
-+
-+
-+
-+#include
-+<tiffio.h>
-+
-+int
-+TIFFFieldReadCount(const TIFFField*
-+fip)
-+
-+DESCRIPTION
-+
-+
-+
-+
-+
-+TIFFFieldReadCount
-+returns the number of values available to be read from the
-+specified TIFF field; that is, the number of arguments that
-+should be supplied to TIFFGetField. For most field
-+types this is a small positive integer, typically 1 or 2,
-+but there are some special values:
-+TIFF_VARIABLE indicates that a variable number of values
-+is possible; then, a uint16 count argument and
-+a pointer data argument must be supplied to
-+TIFFGetField.
-+TIFF_VARIABLE2 is the same as TIFF_VARIABLE
-+except that the count argument must have type
-+uint32.
-+TIFF_SPP indicates that the number of arguments is equal
-+to the image’s number of samples per pixel.
-+
-+fip is a
-+field information pointer previously returned by
-+TIFFFindField, TIFFFieldWithTag, or
-+TIFFFieldWithName.
-+
-+RETURN VALUES
-+
-+
-+
-+
-+
-+TIFFFieldReadCount
-+returns an integer.
-+
-+SEE ALSO
-+
-+
-+
-+
-+
-+libtiff(3TIFF),
-+
-+Libtiff library
-+home page: http://www.remotesensing.org/libtiff/
-+
-+
-+
-diff -Naur tiff-4.0.2.orig/html/man/TIFFFieldTag.3tiff.html tiff-4.0.2/html/man/TIFFFieldTag.3tiff.html
---- tiff-4.0.2.orig/html/man/TIFFFieldTag.3tiff.html 1969-12-31 19:00:00.000000000 -0500
-+++ tiff-4.0.2/html/man/TIFFFieldTag.3tiff.html 2012-07-29 13:28:51.051258516 -0400
-@@ -0,0 +1,88 @@
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+TIFFFieldTag
-+
-+
-+
-+
-+TIFFFieldTag
-+
-+NAME
-+SYNOPSIS
-+DESCRIPTION
-+RETURN VALUES
-+SEE ALSO
-+
-+
-+
-+
-+NAME
-+
-+
-+
-+
-+TIFFFieldTag
-+− Get TIFF field tag value from field information
-+
-+SYNOPSIS
-+
-+
-+
-+
-+#include
-+<tiffio.h>
-+
-+uint32
-+TIFFFieldTag(const TIFFField* fip)
-+
-+DESCRIPTION
-+
-+
-+
-+
-+
-+TIFFFieldTag
-+returns the numeric tag value for a TIFF field. This can be
-+compared to various constants exported by the libtiff
-+header files, such as TIFFTAG_IMAGEWIDTH.
-+
-+fip is a
-+field information pointer previously returned by
-+TIFFFindField, TIFFFieldWithTag, or
-+TIFFFieldWithName.
-+
-+RETURN VALUES
-+
-+
-+
-+
-+
-+TIFFFieldTag
-+returns an integer tag value.
-+
-+SEE ALSO
-+
-+
-+
-+
-+
-+libtiff(3TIFF),
-+
-+Libtiff library
-+home page: http://www.remotesensing.org/libtiff/
-+
-+
-+
-diff -Naur tiff-4.0.2.orig/html/man/TIFFFieldWriteCount.3tiff.html tiff-4.0.2/html/man/TIFFFieldWriteCount.3tiff.html
---- tiff-4.0.2.orig/html/man/TIFFFieldWriteCount.3tiff.html 1969-12-31 19:00:00.000000000 -0500
-+++ tiff-4.0.2/html/man/TIFFFieldWriteCount.3tiff.html 2012-07-29 13:28:51.051258516 -0400
-@@ -0,0 +1,108 @@
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+TIFFFieldWriteCount
-+
-+
-+
-+
-+TIFFFieldWriteCount
-+
-+NAME
-+SYNOPSIS
-+DESCRIPTION
-+RETURN VALUES
-+SEE ALSO
-+
-+
-+
-+
-+NAME
-+
-+
-+
-+
-+
-+TIFFFieldWriteCount
-+− Get number of values to be written to field
-+
-+SYNOPSIS
-+
-+
-+
-+
-+#include
-+<tiffio.h>
-+
-+int
-+TIFFFieldWriteCount(const TIFFField*
-+fip)
-+
-+DESCRIPTION
-+
-+
-+
-+
-+
-+TIFFFieldWriteCount
-+returns the number of values to be written into the
-+specified TIFF field; that is, the number of arguments that
-+should be supplied to TIFFSetField. For most field
-+types this is a small positive integer, typically 1 or 2,
-+but there are some special values:
-+TIFF_VARIABLE indicates that a variable number of values
-+is possible; then, a uint16 count argument and
-+a pointer data argument must be supplied to
-+TIFFSetField.
-+TIFF_VARIABLE2 is the same as TIFF_VARIABLE
-+except that the count argument must have type
-+uint32. (On most modern machines, this makes no
-+practical difference, and the count argument can
-+simply be an int in either case.)
-+TIFF_SPP indicates that the number of arguments must be
-+equal to the image’s number of samples per pixel.
-+
-+fip is a
-+field information pointer previously returned by
-+TIFFFindField, TIFFFieldWithTag, or
-+TIFFFieldWithName.
-+
-+For most field
-+types, TIFFFieldWriteCount returns the same value as
-+TIFFFieldReadCount, but there are some
-+exceptions.
-+
-+RETURN VALUES
-+
-+
-+
-+
-+
-+TIFFFieldWriteCount
-+returns an integer.
-+
-+SEE ALSO
-+
-+
-+
-+
-+
-+libtiff(3TIFF),
-+
-+Libtiff library
-+home page: http://www.remotesensing.org/libtiff/
-+
-+
-+
-diff -Naur tiff-4.0.2.orig/libtiff/libtiff.def tiff-4.0.2/libtiff/libtiff.def
---- tiff-4.0.2.orig/libtiff/libtiff.def 2011-06-21 15:13:24.000000000 -0400
-+++ tiff-4.0.2/libtiff/libtiff.def 2012-07-29 13:28:51.052258497 -0400
-@@ -118,6 +118,12 @@
- TIFFSetTagExtender
- TIFFFieldWithName
- TIFFFieldWithTag
-+ TIFFFieldTag
-+ TIFFFieldName
-+ TIFFFieldDataType
-+ TIFFFieldPassCount
-+ TIFFFieldReadCount
-+ TIFFFieldWriteCount
- TIFFCurrentDirOffset
- TIFFWriteCheck
- TIFFRGBAImageOK
-diff -Naur tiff-4.0.2.orig/libtiff/tif_dirinfo.c tiff-4.0.2/libtiff/tif_dirinfo.c
---- tiff-4.0.2.orig/libtiff/tif_dirinfo.c 2011-05-16 20:21:17.000000000 -0400
-+++ tiff-4.0.2/libtiff/tif_dirinfo.c 2012-07-29 13:28:51.053258480 -0400
-@@ -556,6 +556,42 @@
- return (fip);
- }
-
-+uint32
-+TIFFFieldTag(const TIFFField* fip)
-+{
-+ return fip->field_tag;
-+}
-+
-+const char *
-+TIFFFieldName(const TIFFField* fip)
-+{
-+ return fip->field_name;
-+}
-+
-+TIFFDataType
-+TIFFFieldDataType(const TIFFField* fip)
-+{
-+ return fip->field_type;
-+}
-+
-+int
-+TIFFFieldPassCount(const TIFFField* fip)
-+{
-+ return fip->field_passcount;
-+}
-+
-+int
-+TIFFFieldReadCount(const TIFFField* fip)
-+{
-+ return fip->field_readcount;
-+}
-+
-+int
-+TIFFFieldWriteCount(const TIFFField* fip)
-+{
-+ return fip->field_writecount;
-+}
-+
- const TIFFField*
- _TIFFFindOrRegisterField(TIFF *tif, uint32 tag, TIFFDataType dt)
-
-diff -Naur tiff-4.0.2.orig/libtiff/tiffio.h tiff-4.0.2/libtiff/tiffio.h
---- tiff-4.0.2.orig/libtiff/tiffio.h 2012-06-06 00:58:00.000000000 -0400
-+++ tiff-4.0.2/libtiff/tiffio.h 2012-07-29 13:28:51.054258464 -0400
-@@ -1,4 +1,4 @@
--/* $Id: tiffio.h,v 1.90 2012-06-06 04:58:00 fwarmerdam Exp $ */
-+/* $Id: tiffio.h,v 1.91 2012-07-29 15:45:29 tgl Exp $ */
-
- /*
- * Copyright (c) 1988-1997 Sam Leffler
-@@ -319,6 +319,13 @@
- extern const TIFFField* TIFFFieldWithTag(TIFF*, uint32);
- extern const TIFFField* TIFFFieldWithName(TIFF*, const char *);
-
-+extern uint32 TIFFFieldTag(const TIFFField*);
-+extern const char* TIFFFieldName(const TIFFField*);
-+extern TIFFDataType TIFFFieldDataType(const TIFFField*);
-+extern int TIFFFieldPassCount(const TIFFField*);
-+extern int TIFFFieldReadCount(const TIFFField*);
-+extern int TIFFFieldWriteCount(const TIFFField*);
-+
- typedef int (*TIFFVSetMethod)(TIFF*, uint32, va_list);
- typedef int (*TIFFVGetMethod)(TIFF*, uint32, va_list);
- typedef void (*TIFFPrintMethod)(TIFF*, FILE*, long);
-diff -Naur tiff-4.0.2.orig/man/Makefile.am tiff-4.0.2/man/Makefile.am
---- tiff-4.0.2.orig/man/Makefile.am 2007-02-24 10:03:51.000000000 -0500
-+++ tiff-4.0.2/man/Makefile.am 2012-07-29 13:28:51.054258464 -0400
-@@ -59,6 +59,12 @@
- TIFFcolor.3tiff \
- TIFFDataWidth.3tiff \
- TIFFError.3tiff \
-+ TIFFFieldDataType.3tiff \
-+ TIFFFieldName.3tiff \
-+ TIFFFieldPassCount.3tiff \
-+ TIFFFieldReadCount.3tiff \
-+ TIFFFieldTag.3tiff \
-+ TIFFFieldWriteCount.3tiff \
- TIFFFlush.3tiff \
- TIFFGetField.3tiff \
- TIFFmemory.3tiff \
-diff -Naur tiff-4.0.2.orig/man/TIFFFieldDataType.3tiff tiff-4.0.2/man/TIFFFieldDataType.3tiff
---- tiff-4.0.2.orig/man/TIFFFieldDataType.3tiff 1969-12-31 19:00:00.000000000 -0500
-+++ tiff-4.0.2/man/TIFFFieldDataType.3tiff 2012-07-29 13:28:51.055258450 -0400
-@@ -0,0 +1,53 @@
-+.\" $Id: TIFFFieldDataType.3tiff,v 1.1 2012-07-29 15:45:29 tgl Exp $
-+.\"
-+.\" Copyright (c) 2012, Tom Lane
-+.\"
-+.\" 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 TIFFFieldDataType 3TIFF "July 26, 2012" "libtiff"
-+.SH NAME
-+TIFFFieldDataType \- Get TIFF data type from field information
-+.SH SYNOPSIS
-+.B "#include "
-+.sp
-+.BI "TIFFDataType TIFFFieldDataType(const TIFFField* " fip ")"
-+.SH DESCRIPTION
-+.BR TIFFFieldDataType
-+returns the data type stored in a TIFF field.
-+.P
-+.I fip
-+is a field information pointer previously returned by
-+.BR TIFFFindField ,
-+.BR TIFFFieldWithTag ,
-+or
-+.BR TIFFFieldWithName .
-+.br
-+.SH "RETURN VALUES"
-+.br
-+.BR TIFFFieldDataType
-+returns a member of the enum type
-+.BR TIFFDataType .
-+.br
-+.SH "SEE ALSO"
-+.BR libtiff (3TIFF),
-+.PP
-+Libtiff library home page:
-+.BR http://www.remotesensing.org/libtiff/
-diff -Naur tiff-4.0.2.orig/man/TIFFFieldName.3tiff tiff-4.0.2/man/TIFFFieldName.3tiff
---- tiff-4.0.2.orig/man/TIFFFieldName.3tiff 1969-12-31 19:00:00.000000000 -0500
-+++ tiff-4.0.2/man/TIFFFieldName.3tiff 2012-07-29 13:28:51.055258450 -0400
-@@ -0,0 +1,52 @@
-+.\" $Id: TIFFFieldName.3tiff,v 1.1 2012-07-29 15:45:29 tgl Exp $
-+.\"
-+.\" Copyright (c) 2012, Tom Lane
-+.\"
-+.\" 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 TIFFFieldName 3TIFF "July 26, 2012" "libtiff"
-+.SH NAME
-+TIFFFieldName \- Get TIFF field name from field information
-+.SH SYNOPSIS
-+.B "#include "
-+.sp
-+.BI "const char* TIFFFieldName(const TIFFField* " fip ")"
-+.SH DESCRIPTION
-+.BR TIFFFieldName
-+returns the textual name for a TIFF field.
-+.P
-+.I fip
-+is a field information pointer previously returned by
-+.BR TIFFFindField ,
-+.BR TIFFFieldWithTag ,
-+or
-+.BR TIFFFieldWithName .
-+.br
-+.SH "RETURN VALUES"
-+.br
-+.BR TIFFFieldName
-+returns a constant C string.
-+.br
-+.SH "SEE ALSO"
-+.BR libtiff (3TIFF),
-+.PP
-+Libtiff library home page:
-+.BR http://www.remotesensing.org/libtiff/
-diff -Naur tiff-4.0.2.orig/man/TIFFFieldPassCount.3tiff tiff-4.0.2/man/TIFFFieldPassCount.3tiff
---- tiff-4.0.2.orig/man/TIFFFieldPassCount.3tiff 1969-12-31 19:00:00.000000000 -0500
-+++ tiff-4.0.2/man/TIFFFieldPassCount.3tiff 2012-07-29 13:28:51.055258450 -0400
-@@ -0,0 +1,73 @@
-+.\" $Id: TIFFFieldPassCount.3tiff,v 1.1 2012-07-29 15:45:29 tgl Exp $
-+.\"
-+.\" Copyright (c) 2012, Tom Lane
-+.\"
-+.\" 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 TIFFFieldPassCount 3TIFF "July 26, 2012" "libtiff"
-+.SH NAME
-+TIFFFieldPassCount \- Get whether to pass a count to TIFFGet/SetField
-+.SH SYNOPSIS
-+.B "#include "
-+.sp
-+.BI "int TIFFFieldPassCount(const TIFFField* " fip ")"
-+.SH DESCRIPTION
-+.BR TIFFFieldPassCount
-+returns true (nonzero) if
-+.BR TIFFGetField
-+and
-+.BR TIFFSetField
-+expect a
-+.I count
-+value to be passed before the actual data pointer.
-+.P
-+.I fip
-+is a field information pointer previously returned by
-+.BR TIFFFindField ,
-+.BR TIFFFieldWithTag ,
-+or
-+.BR TIFFFieldWithName .
-+.P
-+When a
-+.I count
-+is required, it will be of type
-+.BR uint32
-+when
-+.BR TIFFFieldReadCount
-+reports
-+.BR TIFF_VARIABLE2 ,
-+and of type
-+.BR uint16
-+otherwise. (This distinction is critical for use of
-+.BR TIFFGetField ,
-+but normally not so for use of
-+.BR TIFFSetField .)
-+.br
-+.SH "RETURN VALUES"
-+.br
-+.BR TIFFFieldPassCount
-+returns an integer that is always 1 (true) or 0 (false).
-+.br
-+.SH "SEE ALSO"
-+.BR libtiff (3TIFF),
-+.PP
-+Libtiff library home page:
-+.BR http://www.remotesensing.org/libtiff/
-diff -Naur tiff-4.0.2.orig/man/TIFFFieldReadCount.3tiff tiff-4.0.2/man/TIFFFieldReadCount.3tiff
---- tiff-4.0.2.orig/man/TIFFFieldReadCount.3tiff 1969-12-31 19:00:00.000000000 -0500
-+++ tiff-4.0.2/man/TIFFFieldReadCount.3tiff 2012-07-29 13:28:51.055258450 -0400
-@@ -0,0 +1,77 @@
-+.\" $Id: TIFFFieldReadCount.3tiff,v 1.1 2012-07-29 15:45:30 tgl Exp $
-+.\"
-+.\" Copyright (c) 2012, Tom Lane
-+.\"
-+.\" 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 TIFFFieldReadCount 3TIFF "July 26, 2012" "libtiff"
-+.SH NAME
-+TIFFFieldReadCount \- Get number of values to be read from field
-+.SH SYNOPSIS
-+.B "#include "
-+.sp
-+.BI "int TIFFFieldReadCount(const TIFFField* " fip ")"
-+.SH DESCRIPTION
-+.BR TIFFFieldReadCount
-+returns the number of values available to be read from the specified
-+TIFF field; that is, the number of arguments that should be supplied to
-+.BR TIFFGetField .
-+For most field types this is a small positive integer, typically 1 or 2,
-+but there are some special values:
-+.br
-+.BR TIFF_VARIABLE
-+indicates that a variable number of values is possible; then, a
-+.BR uint16
-+.I count
-+argument and a pointer
-+.I data
-+argument must be supplied to
-+.BR TIFFGetField .
-+.br
-+.BR TIFF_VARIABLE2
-+is the same as
-+.BR TIFF_VARIABLE
-+except that the
-+.I count
-+argument must have type
-+.BR uint32 .
-+.br
-+.BR TIFF_SPP
-+indicates that the number of arguments is equal to the image's
-+number of samples per pixel.
-+.P
-+.I fip
-+is a field information pointer previously returned by
-+.BR TIFFFindField ,
-+.BR TIFFFieldWithTag ,
-+or
-+.BR TIFFFieldWithName .
-+.br
-+.SH "RETURN VALUES"
-+.br
-+.BR TIFFFieldReadCount
-+returns an integer.
-+.br
-+.SH "SEE ALSO"
-+.BR libtiff (3TIFF),
-+.PP
-+Libtiff library home page:
-+.BR http://www.remotesensing.org/libtiff/
-diff -Naur tiff-4.0.2.orig/man/TIFFFieldTag.3tiff tiff-4.0.2/man/TIFFFieldTag.3tiff
---- tiff-4.0.2.orig/man/TIFFFieldTag.3tiff 1969-12-31 19:00:00.000000000 -0500
-+++ tiff-4.0.2/man/TIFFFieldTag.3tiff 2012-07-29 13:28:51.056258444 -0400
-@@ -0,0 +1,56 @@
-+.\" $Id: TIFFFieldTag.3tiff,v 1.1 2012-07-29 15:45:30 tgl Exp $
-+.\"
-+.\" Copyright (c) 2012, Tom Lane
-+.\"
-+.\" 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 TIFFFieldTag 3TIFF "July 26, 2012" "libtiff"
-+.SH NAME
-+TIFFFieldTag \- Get TIFF field tag value from field information
-+.SH SYNOPSIS
-+.B "#include "
-+.sp
-+.BI "uint32 TIFFFieldTag(const TIFFField* " fip ")"
-+.SH DESCRIPTION
-+.BR TIFFFieldTag
-+returns the numeric tag value for a TIFF field.
-+This can be compared to various constants exported by the
-+.BR libtiff
-+header files, such as
-+.BR TIFFTAG_IMAGEWIDTH .
-+.P
-+.I fip
-+is a field information pointer previously returned by
-+.BR TIFFFindField ,
-+.BR TIFFFieldWithTag ,
-+or
-+.BR TIFFFieldWithName .
-+.br
-+.SH "RETURN VALUES"
-+.br
-+.BR TIFFFieldTag
-+returns an integer tag value.
-+.br
-+.SH "SEE ALSO"
-+.BR libtiff (3TIFF),
-+.PP
-+Libtiff library home page:
-+.BR http://www.remotesensing.org/libtiff/
-diff -Naur tiff-4.0.2.orig/man/TIFFFieldWriteCount.3tiff tiff-4.0.2/man/TIFFFieldWriteCount.3tiff
---- tiff-4.0.2.orig/man/TIFFFieldWriteCount.3tiff 1969-12-31 19:00:00.000000000 -0500
-+++ tiff-4.0.2/man/TIFFFieldWriteCount.3tiff 2012-07-29 13:28:51.056258444 -0400
-@@ -0,0 +1,88 @@
-+.\" $Id: TIFFFieldWriteCount.3tiff,v 1.1 2012-07-29 15:45:30 tgl Exp $
-+.\"
-+.\" Copyright (c) 2012, Tom Lane
-+.\"
-+.\" 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 TIFFFieldWriteCount 3TIFF "July 26, 2012" "libtiff"
-+.SH NAME
-+TIFFFieldWriteCount \- Get number of values to be written to field
-+.SH SYNOPSIS
-+.B "#include "
-+.sp
-+.BI "int TIFFFieldWriteCount(const TIFFField* " fip ")"
-+.SH DESCRIPTION
-+.BR TIFFFieldWriteCount
-+returns the number of values to be written into the specified
-+TIFF field; that is, the number of arguments that should be supplied to
-+.BR TIFFSetField .
-+For most field types this is a small positive integer, typically 1 or 2,
-+but there are some special values:
-+.br
-+.BR TIFF_VARIABLE
-+indicates that a variable number of values is possible; then, a
-+.BR uint16
-+.I count
-+argument and a pointer
-+.I data
-+argument must be supplied to
-+.BR TIFFSetField .
-+.br
-+.BR TIFF_VARIABLE2
-+is the same as
-+.BR TIFF_VARIABLE
-+except that the
-+.I count
-+argument must have type
-+.BR uint32 .
-+(On most modern machines, this makes no practical difference, and the
-+.I count
-+argument can simply be an
-+.BR int
-+in either case.)
-+.br
-+.BR TIFF_SPP
-+indicates that the number of arguments must be equal to the image's
-+number of samples per pixel.
-+.P
-+.I fip
-+is a field information pointer previously returned by
-+.BR TIFFFindField ,
-+.BR TIFFFieldWithTag ,
-+or
-+.BR TIFFFieldWithName .
-+.P
-+For most field types,
-+.BR TIFFFieldWriteCount
-+returns the same value as
-+.BR TIFFFieldReadCount ,
-+but there are some exceptions.
-+.br
-+.SH "RETURN VALUES"
-+.br
-+.BR TIFFFieldWriteCount
-+returns an integer.
-+.br
-+.SH "SEE ALSO"
-+.BR libtiff (3TIFF),
-+.PP
-+Libtiff library home page:
-+.BR http://www.remotesensing.org/libtiff/
-diff -Naur tiff-4.0.2.orig/man/libtiff.3tiff tiff-4.0.2/man/libtiff.3tiff
---- tiff-4.0.2.orig/man/libtiff.3tiff 2005-11-02 06:07:19.000000000 -0500
-+++ tiff-4.0.2/man/libtiff.3tiff 2012-07-29 13:28:51.056258444 -0400
-@@ -1,4 +1,4 @@
--.\" $Id: libtiff.3tiff,v 1.3 2005-11-02 11:07:19 dron Exp $
-+.\" $Id: libtiff.3tiff,v 1.4 2012-07-29 15:45:30 tgl Exp $
- .\"
- .\" Copyright (c) 1988-1997 Sam Leffler
- .\" Copyright (c) 1991-1997 Silicon Graphics, Inc.
-@@ -163,9 +163,18 @@
- TIFFDataWidth return the size of TIFF data types
- TIFFError library error handler
- TIFFFdOpen open a file for reading or writing
-+TIFFFieldDataType get data type from field information
-+TIFFFieldName get field name from field information
-+TIFFFieldPassCount get whether to pass a value count to Get/SetField
-+TIFFFieldReadCount get number of values to be read from field
-+TIFFFieldTag get tag value from field information
-+TIFFFieldWithName get field information given field name
-+TIFFFieldWithTag get field information given tag
-+TIFFFieldWriteCount get number of values to be written to field
- TIFFFileName return name of open file
- TIFFFileno return open file descriptor
- TIFFFindCODEC find standard codec for the specific scheme
-+TIFFFindField get field information given tag and data type
- TIFFFlush flush all pending writes
- TIFFFlushData flush pending data writes
- TIFFGetBitRevTable return bit reversal table
-diff -Naur tiff-4.0.2.orig/tools/tiffset.c tiff-4.0.2/tools/tiffset.c
---- tiff-4.0.2.orig/tools/tiffset.c 2011-03-26 08:07:20.000000000 -0400
-+++ tiff-4.0.2/tools/tiffset.c 2012-07-29 13:28:51.057258427 -0400
-@@ -1,5 +1,5 @@
- /******************************************************************************
-- * $Id: tiffset.c,v 1.16 2011-03-26 12:07:20 fwarmerdam Exp $
-+ * $Id: tiffset.c,v 1.17 2012-07-29 15:45:30 tgl Exp $
- *
- * Project: libtiff tools
- * Purpose: Mainline for setting metadata in existing TIFF files.
-@@ -35,7 +35,6 @@
- #include
-
- #include "tiffio.h"
--#include "tif_dir.h"
-
- static char* usageMsg[] = {
- "usage: tiffset [options] filename",
-@@ -118,25 +117,25 @@
- return 3;
-
- arg_index++;
-- if (fip->field_type == TIFF_ASCII) {
-- if (TIFFSetField(tiff, fip->field_tag, argv[arg_index]) != 1)
-+ if (TIFFFieldDataType(fip) == TIFF_ASCII) {
-+ if (TIFFSetField(tiff, TIFFFieldTag(fip), argv[arg_index]) != 1)
- fprintf( stderr, "Failed to set %s=%s\n",
-- fip->field_name, argv[arg_index] );
-- } else if (fip->field_writecount > 0
-- || fip->field_writecount == TIFF_VARIABLE) {
-+ TIFFFieldName(fip), argv[arg_index] );
-+ } else if (TIFFFieldWriteCount(fip) > 0
-+ || TIFFFieldWriteCount(fip) == TIFF_VARIABLE) {
- int ret = 1;
- short wc;
-
-- if (fip->field_writecount == TIFF_VARIABLE)
-+ if (TIFFFieldWriteCount(fip) == TIFF_VARIABLE)
- wc = atoi(argv[arg_index++]);
- else
-- wc = fip->field_writecount;
-+ wc = TIFFFieldWriteCount(fip);
-
- if (argc - arg_index < wc) {
- fprintf( stderr,
- "Number of tag values is not enough. "
- "Expected %d values for %s tag, got %d\n",
-- wc, fip->field_name, argc - arg_index);
-+ wc, TIFFFieldName(fip), argc - arg_index);
- return 4;
- }
-
-@@ -144,7 +143,7 @@
- int i, size;
- void *array;
-
-- switch (fip->field_type) {
-+ switch (TIFFFieldDataType(fip)) {
- /*
- * XXX: We can't use TIFFDataWidth()
- * to determine the space needed to store
-@@ -186,7 +185,7 @@
- return 4;
- }
-
-- switch (fip->field_type) {
-+ switch (TIFFFieldDataType(fip)) {
- case TIFF_BYTE:
- for (i = 0; i < wc; i++)
- ((uint8 *)array)[i] = atoi(argv[arg_index+i]);
-@@ -226,49 +225,49 @@
- break;
- }
-
-- if (fip->field_passcount) {
-- ret = TIFFSetField(tiff, fip->field_tag,
-+ if (TIFFFieldPassCount(fip)) {
-+ ret = TIFFSetField(tiff, TIFFFieldTag(fip),
- wc, array);
-- } else if (fip->field_tag == TIFFTAG_PAGENUMBER
-- || fip->field_tag == TIFFTAG_HALFTONEHINTS
-- || fip->field_tag == TIFFTAG_YCBCRSUBSAMPLING
-- || fip->field_tag == TIFFTAG_DOTRANGE) {
-- if (fip->field_type == TIFF_BYTE) {
-- ret = TIFFSetField(tiff, fip->field_tag,
-+ } else if (TIFFFieldTag(fip) == TIFFTAG_PAGENUMBER
-+ || TIFFFieldTag(fip) == TIFFTAG_HALFTONEHINTS
-+ || TIFFFieldTag(fip) == TIFFTAG_YCBCRSUBSAMPLING
-+ || TIFFFieldTag(fip) == TIFFTAG_DOTRANGE) {
-+ if (TIFFFieldDataType(fip) == TIFF_BYTE) {
-+ ret = TIFFSetField(tiff, TIFFFieldTag(fip),
- ((uint8 *)array)[0], ((uint8 *)array)[1]);
-- } else if (fip->field_type == TIFF_SHORT) {
-- ret = TIFFSetField(tiff, fip->field_tag,
-+ } else if (TIFFFieldDataType(fip) == TIFF_SHORT) {
-+ ret = TIFFSetField(tiff, TIFFFieldTag(fip),
- ((uint16 *)array)[0], ((uint16 *)array)[1]);
- }
- } else {
-- ret = TIFFSetField(tiff, fip->field_tag,
-+ ret = TIFFSetField(tiff, TIFFFieldTag(fip),
- array);
- }
-
- _TIFFfree(array);
- } else {
-- switch (fip->field_type) {
-+ switch (TIFFFieldDataType(fip)) {
- case TIFF_BYTE:
- case TIFF_SHORT:
- case TIFF_SBYTE:
- case TIFF_SSHORT:
-- ret = TIFFSetField(tiff, fip->field_tag,
-+ ret = TIFFSetField(tiff, TIFFFieldTag(fip),
- atoi(argv[arg_index++]));
- break;
- case TIFF_LONG:
- case TIFF_SLONG:
- case TIFF_IFD:
-- ret = TIFFSetField(tiff, fip->field_tag,
-+ ret = TIFFSetField(tiff, TIFFFieldTag(fip),
- atol(argv[arg_index++]));
- break;
- case TIFF_DOUBLE:
-- ret = TIFFSetField(tiff, fip->field_tag,
-+ ret = TIFFSetField(tiff, TIFFFieldTag(fip),
- atof(argv[arg_index++]));
- break;
- case TIFF_RATIONAL:
- case TIFF_SRATIONAL:
- case TIFF_FLOAT:
-- ret = TIFFSetField(tiff, fip->field_tag,
-+ ret = TIFFSetField(tiff, TIFFFieldTag(fip),
- (float)atof(argv[arg_index++]));
- break;
- default:
-@@ -277,7 +276,7 @@
- }
-
- if (ret != 1)
-- fprintf(stderr, "Failed to set %s\n", fip->field_name);
-+ fprintf(stderr, "Failed to set %s\n", TIFFFieldName(fip));
- arg_index += wc;
- }
- } else if (strcmp(argv[arg_index],"-sf") == 0 && arg_index < argc-3) {
-@@ -292,10 +291,10 @@
- if (!fip)
- return 3;
-
-- if (fip->field_type != TIFF_ASCII) {
-+ if (TIFFFieldDataType(fip) != TIFF_ASCII) {
- fprintf( stderr,
- "Only ASCII tags can be set from file. "
-- "%s is not ASCII tag.\n", fip->field_name );
-+ "%s is not ASCII tag.\n", TIFFFieldName(fip) );
- return 5;
- }
-
-@@ -312,9 +311,9 @@
-
- fclose( fp );
-
-- if(TIFFSetField( tiff, fip->field_tag, text ) != 1) {
-+ if(TIFFSetField( tiff, TIFFFieldTag(fip), text ) != 1) {
- fprintf(stderr, "Failed to set %s from file %s\n",
-- fip->field_name, argv[arg_index]);
-+ TIFFFieldName(fip), argv[arg_index]);
- }
-
- _TIFFfree( text );
diff --git a/libtiff.spec b/libtiff.spec
index 7306416..4e194fd 100644
--- a/libtiff.spec
+++ b/libtiff.spec
@@ -1,7 +1,7 @@
Summary: Library of functions for manipulating TIFF format image files
Name: libtiff
-Version: 4.0.2
-Release: 6%{?dist}
+Version: 4.0.3
+Release: 1%{?dist}
License: libtiff
Group: System Environment/Libraries
@@ -9,10 +9,6 @@ URL: http://www.remotesensing.org/libtiff/
Source: ftp://ftp.remotesensing.org/pub/libtiff/tiff-%{version}.tar.gz
-Patch1: libtiff-4.0.2-bigendian.patch
-Patch2: libtiff-CVE-2012-3401.patch
-Patch3: libtiff-accessors.patch
-
BuildRequires: zlib-devel libjpeg-devel jbigkit-devel
BuildRequires: libtool automake autoconf pkgconfig
@@ -62,10 +58,6 @@ image files using the libtiff library.
%prep
%setup -q -n tiff-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
# Use build system's libtool.m4, not the one in the package.
rm -f libtool.m4
@@ -168,6 +160,9 @@ find html -name 'Makefile*' | xargs rm
%{_mandir}/man1/*
%changelog
+* Thu Oct 4 2012 Tom Lane 4.0.3-1
+- Update to libtiff 4.0.3
+
* Fri Aug 3 2012 Tom Lane 4.0.2-6
- Remove compat subpackage; no longer needed
- Minor specfile cleanup per suggestions from Tom Callaway
diff --git a/sources b/sources
index 5a4b39d..10672da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04a08fa1e07e696e820a0c3f32465a13 tiff-4.0.2.tar.gz
+051c1068e6a0627f461948c365290410 tiff-4.0.3.tar.gz