mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-19 19:59:43 +00:00
Update to 4.0.4
This commit is contained in:
parent
180681de13
commit
adcbbbb487
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=390660
@ -2,8 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= tiff
|
||||
DISTVERSION= 4.0.4beta
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 4.0.4
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \
|
||||
http://download.osgeo.org/libtiff/
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (tiff-4.0.4beta.tar.gz) = 5bd6c8e9be4ec318f6beb0c3f28b9ee31bd8b615195a00e0acc3eb5d08b26c1b
|
||||
SIZE (tiff-4.0.4beta.tar.gz) = 2098962
|
||||
SHA256 (tiff-4.0.4.tar.gz) = 8cb1d90c96f61cdfc0bcf036acc251c9dbe6320334da941c7a83cfe1576ef890
|
||||
SIZE (tiff-4.0.4.tar.gz) = 2100766
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- Makefile.in.orig 2012-09-22 18:08:18.000000000 +0200
|
||||
+++ Makefile.in 2012-10-13 19:35:28.000000000 +0200
|
||||
@@ -375,7 +375,7 @@
|
||||
--- Makefile.in.orig 2015-06-21 19:07:53 UTC
|
||||
+++ Makefile.in
|
||||
@@ -434,7 +434,7 @@ EXTRA_DIST = \
|
||||
|
||||
dist_doc_DATA = $(docfiles)
|
||||
SUBDIRS = port libtiff tools build contrib test man html
|
||||
@ -9,7 +9,7 @@
|
||||
pkgconfig_DATA = libtiff-4.pc
|
||||
all: all-recursive
|
||||
|
||||
@@ -427,19 +427,6 @@
|
||||
@@ -485,19 +485,6 @@ distclean-libtool:
|
||||
-rm -f libtool config.lt
|
||||
install-dist_docDATA: $(dist_doc_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
|
@ -1,70 +0,0 @@
|
||||
--- tools/tiffdither.c.orig 2013-05-02 14:44:29 UTC
|
||||
+++ tools/tiffdither.c
|
||||
@@ -39,6 +39,7 @@
|
||||
#endif
|
||||
|
||||
#include "tiffio.h"
|
||||
+#include "tiffiop.h"
|
||||
|
||||
#define streq(a,b) (strcmp(a,b) == 0)
|
||||
#define strneq(a,b,n) (strncmp(a,b,n) == 0)
|
||||
@@ -56,7 +57,7 @@ static void usage(void);
|
||||
* Floyd-Steinberg error propragation with threshold.
|
||||
* This code is stolen from tiffmedian.
|
||||
*/
|
||||
-static void
|
||||
+static int
|
||||
fsdither(TIFF* in, TIFF* out)
|
||||
{
|
||||
unsigned char *outline, *inputline, *inptr;
|
||||
@@ -68,14 +69,19 @@ fsdither(TIFF* in, TIFF* out)
|
||||
int lastline, lastpixel;
|
||||
int bit;
|
||||
tsize_t outlinesize;
|
||||
+ int errcode = 0;
|
||||
|
||||
imax = imagelength - 1;
|
||||
jmax = imagewidth - 1;
|
||||
inputline = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(in));
|
||||
- thisline = (short *)_TIFFmalloc(imagewidth * sizeof (short));
|
||||
- nextline = (short *)_TIFFmalloc(imagewidth * sizeof (short));
|
||||
+ thisline = (short *)_TIFFmalloc(TIFFSafeMultiply(tmsize_t, imagewidth, sizeof (short)));
|
||||
+ nextline = (short *)_TIFFmalloc(TIFFSafeMultiply(tmsize_t, imagewidth, sizeof (short)));
|
||||
outlinesize = TIFFScanlineSize(out);
|
||||
outline = (unsigned char *) _TIFFmalloc(outlinesize);
|
||||
+ if (! (inputline && thisline && nextline && outline)) {
|
||||
+ fprintf(stderr, "Out of memory.\n");
|
||||
+ goto skip_on_error;
|
||||
+ }
|
||||
|
||||
/*
|
||||
* Get first line
|
||||
@@ -93,7 +99,7 @@ fsdither(TIFF* in, TIFF* out)
|
||||
nextline = tmpptr;
|
||||
lastline = (i == imax);
|
||||
if (TIFFReadScanline(in, inputline, i, 0) <= 0)
|
||||
- break;
|
||||
+ goto skip_on_error;
|
||||
inptr = inputline;
|
||||
nextptr = nextline;
|
||||
for (j = 0; j < imagewidth; ++j)
|
||||
@@ -131,13 +137,18 @@ fsdither(TIFF* in, TIFF* out)
|
||||
}
|
||||
}
|
||||
if (TIFFWriteScanline(out, outline, i-1, 0) < 0)
|
||||
- break;
|
||||
+ goto skip_on_error;
|
||||
}
|
||||
+ goto exit_label;
|
||||
+
|
||||
skip_on_error:
|
||||
+ errcode = 1;
|
||||
+ exit_label:
|
||||
_TIFFfree(inputline);
|
||||
_TIFFfree(thisline);
|
||||
_TIFFfree(nextline);
|
||||
_TIFFfree(outline);
|
||||
+ return errcode;
|
||||
}
|
||||
|
||||
static uint16 compression = COMPRESSION_PACKBITS;
|
@ -30,11 +30,11 @@ lib/libtiff.a
|
||||
lib/libtiff.so
|
||||
lib/libtiff.so.4
|
||||
lib/libtiff.so.5
|
||||
lib/libtiff.so.5.2.1
|
||||
lib/libtiff.so.5.2.2
|
||||
lib/libtiffxx.a
|
||||
lib/libtiffxx.so
|
||||
lib/libtiffxx.so.5
|
||||
lib/libtiffxx.so.5.2.1
|
||||
lib/libtiffxx.so.5.2.2
|
||||
libdata/pkgconfig/libtiff-4.pc
|
||||
man/man1/bmp2tiff.1.gz
|
||||
man/man1/fax2ps.1.gz
|
||||
@ -302,4 +302,5 @@ man/man3/libtiff.3tiff.gz
|
||||
%%PORTDOCS%%%%DOCSDIR%%/v4.0.1.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/v4.0.2.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/v4.0.3.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/v4.0.4.html
|
||||
%%PORTDOCS%%%%DOCSDIR%%/v4.0.4beta.html
|
||||
|
Loading…
Reference in New Issue
Block a user