head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.44 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.42 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.40 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.38 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.36 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.34 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.32 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.30 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.28 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.26 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.24 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.22 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.20 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.18 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.16 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.14 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.12 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.10 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.8 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.0.4 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.2; locks; strict; comment @# @; 1.2 date 2004.12.28.23.10.09; author reed; state dead; branches; next 1.1; 1.1 date 2004.10.18.14.37.24; author tron; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2004.10.18.14.37.24; author agc; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2004.10.18.17.03.48; author agc; state Exp; branches; next ; desc @@ 1.2 log @Upgrade tiff to 3.7.1. Remove OpenWindows workaround in pkgsrc for this. Too many changes to include here. See http://www.remotesensing.org/libtiff/v3.7.1.html and http://www.remotesensing.org/libtiff/v3.7.0.html and previous change files for changes information. tiff-3.7.1 now includes the lzw compression code again. It also uses autoconf and libtool now. A new tool is bmp2tiff. Docs are placed under share/doc/tiff/html instead of share/doc/html/tiff. Many manpage symlinks are now missing. (This was reported to tiff list.) @ text @$NetBSD: patch-an,v 1.1 2004/10/18 14:37:24 tron Exp $ --- libtiff/tif_dirinfo.c.orig 2003-12-22 09:22:15.000000000 +0100 +++ libtiff/tif_dirinfo.c 2004-10-18 16:25:32.000000000 +0200 @@@@ -31,6 +31,8 @@@@ */ #include "tiffiop.h" #include +#include +#include /* * NB: NB: THIS ARRAY IS ASSUMED TO BE SORTED BY TAG. @@@@ -309,6 +311,7 @@@@ tif->tif_fieldinfo = (TIFFFieldInfo**) _TIFFmalloc(n * sizeof (TIFFFieldInfo*)); } + assert(tif->tif_fieldinfo != NULL); tp = &tif->tif_fieldinfo[tif->tif_nfields]; for (i = 0; i < n; i++) tp[i] = (TIFFFieldInfo*) &info[i]; /* XXX */ @@@@ -376,7 +379,7 @@@@ TIFFDataType _TIFFSampleToTagType(TIFF* tif) { - int bps = (int) TIFFhowmany(tif->tif_dir.td_bitspersample, 8); + uint32 bps = TIFFhowmany8(tif->tif_dir.td_bitspersample); switch (tif->tif_dir.td_sampleformat) { case SAMPLEFORMAT_IEEEFP: @@@@ -422,9 +425,6 @@@@ return ((const TIFFFieldInfo *)0); } -#include -#include - const TIFFFieldInfo* _TIFFFieldWithTag(TIFF* tif, ttag_t tag) { @@@@ -460,6 +460,8 @@@@ TIFFFieldInfo *fld; fld = (TIFFFieldInfo *) _TIFFmalloc(sizeof (TIFFFieldInfo)); + if (fld == NULL) + return NULL; _TIFFmemset( fld, 0, sizeof(TIFFFieldInfo) ); fld->field_tag = tag; @@@@ -470,6 +472,10 @@@@ fld->field_oktochange = TRUE; fld->field_passcount = TRUE; fld->field_name = (char *) _TIFFmalloc(32); + if (fld->field_name == NULL) { + _TIFFfree(fld); + return NULL; + } /* note that this name is a special sign to TIFFClose() and * _TIFFSetupFieldInfo() to free the field @ 1.1 log @Add various bug fixes taken from Debian's unstable distribution which include fixes for CESA-2004-006. Bump package revision. @ text @d1 1 a1 1 $NetBSD$ @ 1.1.2.1 log @file patch-an was added on branch pkgsrc-2004Q3 on 2004-10-18 14:37:24 +0000 @ text @d1 60 @ 1.1.2.2 log @Pullup ticket 122 - requested by Matthias Scheler security fix for tiff Modified Files: pkgsrc/graphics/tiff: Makefile Log Message: Derive "PKGNAME" from "DISTNAME" instead of defining it manually. Modified Files: pkgsrc/graphics/tiff: Makefile Log Message: Add mirror on "ftp.fu-berlin.de" to master site list. Modified Files: pkgsrc/graphics/tiff: Makefile distinfo pkgsrc/graphics/tiff/patches: patch-ag Added Files: pkgsrc/graphics/tiff/patches: patch-ai patch-aj patch-ak patch-al patch-am patch-an patch-ao patch-ap patch-aq patch-ar patch-as patch-at patch-au patch-av patch-aw patch-ax Log Message: Add various bug fixes taken from Debian's unstable distribution which include fixes for CESA-2004-006. Bump package revision. @ text @a0 60 $NetBSD: patch-an,v 1.1.2.1 2004/10/18 17:03:48 agc Exp $ --- libtiff/tif_dirinfo.c.orig 2003-12-22 09:22:15.000000000 +0100 +++ libtiff/tif_dirinfo.c 2004-10-18 16:25:32.000000000 +0200 @@@@ -31,6 +31,8 @@@@ */ #include "tiffiop.h" #include +#include +#include /* * NB: NB: THIS ARRAY IS ASSUMED TO BE SORTED BY TAG. @@@@ -309,6 +311,7 @@@@ tif->tif_fieldinfo = (TIFFFieldInfo**) _TIFFmalloc(n * sizeof (TIFFFieldInfo*)); } + assert(tif->tif_fieldinfo != NULL); tp = &tif->tif_fieldinfo[tif->tif_nfields]; for (i = 0; i < n; i++) tp[i] = (TIFFFieldInfo*) &info[i]; /* XXX */ @@@@ -376,7 +379,7 @@@@ TIFFDataType _TIFFSampleToTagType(TIFF* tif) { - int bps = (int) TIFFhowmany(tif->tif_dir.td_bitspersample, 8); + uint32 bps = TIFFhowmany8(tif->tif_dir.td_bitspersample); switch (tif->tif_dir.td_sampleformat) { case SAMPLEFORMAT_IEEEFP: @@@@ -422,9 +425,6 @@@@ return ((const TIFFFieldInfo *)0); } -#include -#include - const TIFFFieldInfo* _TIFFFieldWithTag(TIFF* tif, ttag_t tag) { @@@@ -460,6 +460,8 @@@@ TIFFFieldInfo *fld; fld = (TIFFFieldInfo *) _TIFFmalloc(sizeof (TIFFFieldInfo)); + if (fld == NULL) + return NULL; _TIFFmemset( fld, 0, sizeof(TIFFFieldInfo) ); fld->field_tag = tag; @@@@ -470,6 +472,10 @@@@ fld->field_oktochange = TRUE; fld->field_passcount = TRUE; fld->field_name = (char *) _TIFFmalloc(32); + if (fld->field_name == NULL) { + _TIFFfree(fld); + return NULL; + } /* note that this name is a special sign to TIFFClose() and * _TIFFSetupFieldInfo() to free the field @