graphics/tiff: sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2019-11-11 09:53:30 +01:00
parent a0ae1a1848
commit e99f208a0f
4 changed files with 7 additions and 23 deletions

View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= tiff
PORTVERSION= 4.0.10
PORTREVISION= 1
PORTVERSION= 4.1.0
CATEGORIES= graphics
MASTER_SITES= https://download.osgeo.org/libtiff/

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1541970522
SHA256 (tiff-4.0.10.tar.gz) = 2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4
SIZE (tiff-4.0.10.tar.gz) = 2402867
TIMESTAMP = 1572853967
SHA256 (tiff-4.1.0.tar.gz) = 5d29f32517dadb6dbcd1255ea5bbc93a2b54b94fbf83653b4d65c7d6775b8634
SIZE (tiff-4.1.0.tar.gz) = 2421581

View file

@ -1,16 +0,0 @@
Fix tiff2ps error regarding "Inconsistent value of es" by allowing es to be zero.
--- tools/tiff2ps.c.orig 2018-11-03 19:25:46 UTC
+++ tools/tiff2ps.c
@@ -2444,9 +2444,9 @@ PSDataColorContig(FILE* fd, TIFF* tif, u
unsigned char *cp, c;
(void) w;
- if( es <= 0 )
+ if( es < 0 )
{
- TIFFError(filename, "Inconsistent value of es: %d", es);
+ TIFFError(filename, "Inconsistent value of es: %d (samplesperpixel=%u, nc=%d)", es, samplesperpixel, nc);
return;
}
tf_buf = (unsigned char *) _TIFFmalloc(tf_bytesperrow);

View file

@ -24,11 +24,11 @@ include/tiffvers.h
lib/libtiff.a
lib/libtiff.so
lib/libtiff.so.5
lib/libtiff.so.5.4.0
lib/libtiff.so.5.5.0
lib/libtiffxx.a
lib/libtiffxx.so
lib/libtiffxx.so.5
lib/libtiffxx.so.5.4.0
lib/libtiffxx.so.5.5.0
libdata/pkgconfig/libtiff-4.pc
man/man1/fax2ps.1.gz
man/man1/fax2tiff.1.gz
@ -290,3 +290,4 @@ man/man3/libtiff.3tiff.gz
%%PORTDOCS%%%%DOCSDIR%%/v4.0.7.html
%%PORTDOCS%%%%DOCSDIR%%/v4.0.8.html
%%PORTDOCS%%%%DOCSDIR%%/v4.0.9.html
%%PORTDOCS%%%%DOCSDIR%%/v4.1.0.html