summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--man/TIFFGetField.3tiff4
-rw-r--r--man/TIFFSetDirectory.3tiff4
-rw-r--r--man/TIFFSetField.3tiff4
4 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 77a64385..62258ddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2017-06-30 Even Rouault <even.rouault at spatialys.com>
+ * man: update documentation regarding SubIFD tag and
+ TIFFSetSubDirectory() data type.
+ Patch by Eric Piel
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2671
+
+2017-06-30 Even Rouault <even.rouault at spatialys.com>
+
* libtiff/tif_dirwrite.c: in TIFFWriteDirectoryTagCheckedXXXX()
functions associated with LONG8/SLONG8 data type, replace assertion that
the file is BigTIFF, by a non-fatal error.
diff --git a/man/TIFFGetField.3tiff b/man/TIFFGetField.3tiff
index bdf41a25..528019e1 100644
--- a/man/TIFFGetField.3tiff
+++ b/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/man/TIFFSetDirectory.3tiff b/man/TIFFSetDirectory.3tiff
index 93faf193..0f109f66 100644
--- a/man/TIFFSetDirectory.3tiff
+++ b/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/man/TIFFSetField.3tiff b/man/TIFFSetField.3tiff
index 1754827c..695a199e 100644
--- a/man/TIFFSetField.3tiff
+++ b/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