tiff-4.0.9:ver.bump

This commit is contained in:
Rmys
2018-07-27 20:58:42 +03:00
parent 748eae4665
commit fdc09b99d0
5 changed files with 16 additions and 89 deletions
@@ -1,33 +0,0 @@
From 7757b91a71631ada835740733f3dab51eda36df8 Mon Sep 17 00:00:00 2001
From: erouault <erouault>
Date: Tue, 13 Dec 2016 18:15:48 +0000
Subject: [PATCH] * libtiff/tif_fax3.h: revert change done on 2016-01-09 that
made Param member of TIFFFaxTabEnt structure a uint16 to reduce size of the
binary. It happens that the Hylafax software uses the tables that follow this
typedef (TIFFFaxMainTable, TIFFFaxWhiteTable, TIFFFaxBlackTable), also they
are not in a public libtiff header. Raised by Lee Howard. Fixes
http://bugzilla.maptools.org/show_bug.cgi?id=2636
---
ChangeLog | 10 ++++++++++
libtiff/tif_fax3.h | 4 +++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/libtiff/tif_fax3.h b/libtiff/tif_fax3.h
index aafb5a7..2b64290 100644
--- a/libtiff/tif_fax3.h
+++ b/libtiff/tif_fax3.h
@@ -81,10 +81,12 @@ extern void _TIFFFax3fillruns(unsigned char*, uint32*, uint32*, uint32);
#define S_MakeUp 11
#define S_EOL 12
+/* WARNING: do not change the layout of this structure as the Halyfax software */
+/* really depends on it. See http://bugzilla.maptools.org/show_bug.cgi?id=2636 */
typedef struct { /* state table entry */
unsigned char State; /* see above */
unsigned char Width; /* width of code in bits */
- uint16 Param; /* unsigned 16-bit run length in bits */
+ uint32 Param; /* unsigned 32-bit run length in bits (holds on 16 bit actually, but cannot be changed. See above warning) */
} TIFFFaxTabEnt;
extern const TIFFFaxTabEnt TIFFFaxMainTable[];
@@ -1,13 +0,0 @@
--- libtiff/tif_dir.c 2011-04-04 05:58:54.000000000 -0400
+++ libtiff/tif_dir.c.oden 2011-04-04 05:59:08.000000000 -0400
@@ -370,6 +370,10 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va
case TIFFTAG_YCBCRSUBSAMPLING:
td->td_ycbcrsubsampling[0] = (uint16) va_arg(ap, int);
td->td_ycbcrsubsampling[1] = (uint16) va_arg(ap, int);
+ if (td->td_ycbcrsubsampling[0] > 4)
+ td->td_ycbcrsubsampling[0] = (td->td_compression == 7) ? 1 : 2;
+ if (td->td_ycbcrsubsampling[1] > 4)
+ td->td_ycbcrsubsampling[1] = (td->td_compression == 7) ? 1 : 2;
break;
case TIFFTAG_TRANSFERFUNCTION:
v = (td->td_samplesperpixel - td->td_extrasamples) > 1 ? 3 : 1;
@@ -1,24 +0,0 @@
diff -Naur tiff-3.9.1/Makefile.am tiff-3.9.1.oden/Makefile.am
--- tiff-3.9.1/Makefile.am 2009-08-21 18:46:01.000000000 +0200
+++ tiff-3.9.1.oden/Makefile.am 2009-08-30 12:43:13.000000000 +0200
@@ -47,7 +47,7 @@
dist_doc_DATA = $(docfiles)
-SUBDIRS = port libtiff tools build contrib test man html
+SUBDIRS = port libtiff tools build test man html
release:
(rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)
diff -Naur tiff-3.9.1/Makefile.in tiff-3.9.1.oden/Makefile.in
--- tiff-3.9.1/Makefile.in 2009-08-28 20:41:13.000000000 +0200
+++ tiff-3.9.1.oden/Makefile.in 2009-08-30 12:43:33.000000000 +0200
@@ -331,7 +331,7 @@
nmake.opt
dist_doc_DATA = $(docfiles)
-SUBDIRS = port libtiff tools build contrib test man html
+SUBDIRS = port libtiff tools build test man html
all: all-recursive
.SUFFIXES:
@@ -1,10 +0,0 @@
--- libtiff/tif_jpeg.c 2010-09-30 13:43:31.045146032 +0200
+++ libtiff/tif_jpeg.c.oden 2010-09-30 13:44:59.005141117 +0200
@@ -850,6 +850,7 @@ JPEGPreDecode(TIFF* tif, tsample_t s)
if (downsampled_output) {
/* Need to use raw-data interface to libjpeg */
sp->cinfo.d.raw_data_out = TRUE;
+ sp->cinfo.d.do_fancy_upsampling = FALSE;
tif->tif_decoderow = JPEGDecodeRaw;
tif->tif_decodestrip = JPEGDecodeRaw;
tif->tif_decodetile = JPEGDecodeRaw;
+16 -9
View File
@@ -12,20 +12,20 @@
<IsA>library</IsA>
<Summary>Library for manipulation of TIFF (Tag Image File Format) images</Summary>
<Description>This software provides support for the Tag Image File Format (TIFF), a widely used format for storing image data.</Description>
<Archive sha1sum="88717c97480a7976c94d23b6d9ed4ac74715267f" type="targz">https://download.osgeo.org/libtiff/tiff-4.0.8.tar.gz</Archive>
<Archive sha1sum="87d4543579176cc568668617c22baceccd568296" type="targz">https://download.osgeo.org/libtiff/tiff-4.0.9.tar.gz</Archive>
<BuildDependencies>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>jbigkit-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">gentoo/tiff-4.0.7-pdfium-0005-Leak-TIFFFetchStripThing.patch</Patch>
<Patch level="1">gentoo/tiff-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch</Patch>
<Patch level="1">gentoo/tiff-4.0.7-pdfium-0007-uninitialized-value.patch</Patch>
<Patch level="1">gentoo/tiff-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch</Patch>
<Patch level="1">gentoo/tiff-4.0.7-pdfium-0013-validate-refblackwhite.patch</Patch>
<Patch level="1">gentoo/tiff-4.0.7-pdfium-0017-safe_skews_in_gtTileContig.patch</Patch>
<Patch level="1">gentoo/tiff-4.0.7-pdfium-0018-fix-leak-in-PredictorSetupDecode.patch</Patch>
<Patch level="1">gentoo/tiff-4.0.7-pdfium-0021-oom-TIFFFillStrip.patch</Patch>
<!-- <Patch level="1">gentoo/tiff-4.0.7-pdfium-0005-Leak-TIFFFetchStripThing.patch</Patch> -->
<!-- <Patch level="1">gentoo/tiff-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch</Patch> -->
<!-- <Patch level="1">gentoo/tiff-4.0.7-pdfium-0007-uninitialized-value.patch</Patch> -->
<!-- <Patch level="1">gentoo/tiff-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch</Patch> -->
<!-- <Patch level="1">gentoo/tiff-4.0.7-pdfium-0013-validate-refblackwhite.patch</Patch> -->
<!-- <Patch level="1">gentoo/tiff-4.0.7-pdfium-0017-safe_skews_in_gtTileContig.patch</Patch> -->
<!-- <Patch level="1">gentoo/tiff-4.0.7-pdfium-0018-fix-leak-in-PredictorSetupDecode.patch</Patch> -->
<!-- <Patch level="1">gentoo/tiff-4.0.7-pdfium-0021-oom-TIFFFillStrip.patch</Patch> -->
</Patches>
</Source>
<Package>
@@ -80,6 +80,13 @@
</Files>
</Package>
<History>
<Update release="6">
<Date>2018-07-27</Date>
<Version>4.0.9</Version>
<Comment>Version Bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="5">
<Date>2018-03-21</Date>
<Version>4.0.8</Version>