Update to 6.0.2 release.

This commit is contained in:
Alex Dupre 2005-08-28 07:59:26 +00:00
parent 0083ef4403
commit b2f90dc533
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=141035
4 changed files with 4 additions and 67 deletions

View file

@ -6,10 +6,9 @@
#
PORTNAME= pdflib
PORTVERSION= 6.0.1
PORTREVISION= 2
PORTVERSION= 6.0.2
CATEGORIES= print
MASTER_SITES= http://voodoo.oberon.net/download/
MASTER_SITES= http://pdflib.com/products/pdflib/download/${PORTVERSION:S/.//g}src/
DISTNAME= PDFlib-Lite-${PORTVERSION}
MAINTAINER= ale@FreeBSD.org

View file

@ -1,2 +1,2 @@
MD5 (PDFlib-Lite-6.0.1.tar.gz) = 6a4f3c0c8407e0ed1d5c9d5233b1b62b
SIZE (PDFlib-Lite-6.0.1.tar.gz) = 3642803
MD5 (PDFlib-Lite-6.0.2.tar.gz) = eaeb8d8f000af50e6057eb2378ab6a94
SIZE (PDFlib-Lite-6.0.2.tar.gz) = 3682148

View file

@ -1,51 +0,0 @@
--- libs/tiff/tif_dirread.c.orig Fri Nov 26 21:39:06 2004
+++ libs/tiff/tif_dirread.c Mon Aug 1 01:06:34 2005
@@ -69,7 +69,7 @@
char *cp = NULL;
tsize_t bytes = nmemb * elem_size;
- if (elem_size && bytes / elem_size == nmemb)
+ if (nmemb && elem_size && bytes / elem_size == nmemb)
cp = (char*)_TIFFmalloc(tif, bytes);
if (cp == NULL)
@@ -1267,12 +1267,16 @@
uint16 buf[10];
uint16* v = buf;
- if (samples > (int)NITEMS(buf))
- v = (uint16*) CheckMalloc(tif, samples, sizeof (uint16),
+ if (dir->tdir_count > (int)NITEMS(buf))
+ v = (uint16*) CheckMalloc(tif, dir->tdir_count, sizeof (uint16),
"to fetch per-sample values");
if (v && TIFFFetchShortArray(tif, dir, v)) {
int i;
- for (i = 1; i < samples; i++)
+ int check_count = dir->tdir_count;
+ if( samples < check_count )
+ check_count = samples;
+
+ for (i = 1; i < check_count; i++)
if (v[i] != v[0]) {
TIFFError(tif->tif_name,
"Cannot handle different per-sample values for field \"%s\"",
@@ -1304,12 +1308,16 @@
double buf[10];
double* v = buf;
- if (samples > (int)NITEMS(buf))
- v = (double*) CheckMalloc(tif, samples, sizeof (double),
+ if (dir->tdir_count > (int)NITEMS(buf))
+ v = (double*) CheckMalloc(tif, dir->tdir_count, sizeof (double),
"to fetch per-sample values");
if (v && TIFFFetchAnyArray(tif, dir, v)) {
int i;
- for (i = 1; i < samples; i++)
+ int check_count = dir->tdir_count;
+ if( samples < check_count )
+ check_count = samples;
+
+ for (i = 1; i < check_count; i++)
if (v[i] != v[0]) {
TIFFError(tif->tif_name,
"Cannot handle different per-sample values for field \"%s\"",

View file

@ -1,11 +0,0 @@
--- libs/tiff/tif_fax3.c.orig Sun Jan 23 12:05:49 2005
+++ libs/tiff/tif_fax3.c Sun Jan 23 12:06:35 2005
@@ -445,7 +445,7 @@
char *cp = NULL;
tsize_t bytes = nmemb * elem_size;
- if (elem_size && bytes / elem_size == nmemb)
+ if (nmemb && elem_size && bytes / elem_size == nmemb)
cp = (char*) _TIFFmalloc(tif, bytes);
if (cp == NULL)