pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/tiff Update to 3.9.0:
details: https://anonhg.NetBSD.org/pkgsrc/rev/2a69cfa631ff
branches: trunk
changeset: 398117:2a69cfa631ff
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Aug 24 08:50:33 2009 +0000
description:
Update to 3.9.0:
MAJOR CHANGES:
* New tiffcrop utility contributed by Richard Nolde. tiffcrop does the
same as tiffcp, but also can crop, extract, rotate and mirror images.
* tif_jbig.c: Added support for JBIG compression scheme (34661 code),
contributed by Lee Howard.
* Totally new implementation of OJPEG module from Joris Van Damme. No
need to patch libjpeg anymore. Many OJPEG files should be supported
now that was not supported previously.
------------------------------------------------
CHANGES IN THE SOFTWARE CONFIGURATION:
* tif_config.wince.h, tiffconf.wince.h, tif_wince.c: WinCE-specific
compatibility stuff from Mateusz Loskot.
* Rename config.h.vc and tif_config.h.vc to config.vc.h and
tif_config.vc.h for easier identification by folks using an IDE.
* configure, configure.ac: OJPEG support enabled by default (i.e., whe
the conformant JPEG support enabled).
* README.vms, Makefile.am, configure.com, libtiff/{Makefile.am,
tif_config.h-vms, tif_stream.cxx, tif_vms.c, tiffconf.h-vms}: Added
support for OpenVMS by Alexey Chupahin.
* nmake.opt: use /EHsc for VS2005 compatibility. Also define
_CRT_SECURE_NO_DEPRECATE to avoid noise on VS2005.
------------------------------------------------
CHANGES IN LIBTIFF:
* tif_dirinfo.c (_TIFFFindFieldInfo): Don't attempt to bsearch() on a
NULL fieldinfo list. (_TIFFFindFieldInfoByName): Don't attempt to
lfind() on a NULL fieldinfo list.
* tif_jpeg.c: Changed JPEGInitializeLibJPEG() so that it will convert
from decompressor to compressor or compress to decompress if required
by the force arguments. This works around a problem in where the
JPEGFixupTestSubsampling() may cause a decompressor to be setup on a
directory when later a compressor is required with the force flag set.
Occurs with the addtiffo program for instance.
* tif_dirwrite.c: Fixed swapping of byte arrays stored in-place in tag
offsets as per bug
http://bugzilla.remotesensing.org/show_bug.cgi?id=1363
* tif_getimage.c: workaround for 'Fractional scanline' error reading
OJPEG images with rowsperstrip that is not a multiple of vertical
subsampling factor. This bug is mentioned in
http://bugzilla.remotesensing.org/show_bug.cgi?id=1390 and
http://www.asmail.be/msg0054766825.html
* tif_dirread.c: Added special function to handle SubjectDistance EXIF
tag as per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1362
* tif_dirread.c, tif_read.c: Type of the byte counters changed from
tsize_t to uint32 to be able to work with data arrays larger than 2GB.
Fixes bug http://bugzilla.remotesensing.org/show_bug.cgi?id=89 Idea
submitted by Matt Hancher.
* tif_dir.c: Workaround for incorrect TIFFs with ExtraSamples == 999
produced by Corel Draw. As per bug
http://bugzilla.remotesensing.org/show_bug.cgi?id=1490
* tif_write.c: TIFFAppendToStrip() - clear sorted flag if we move a
strip. http://bugzilla.remotesensing.org/show_bug.cgi?id=1359
* tif_fax3.c: Save the state of printdir codec dependent method.
* tif_jpeg.c: Save the state of printdir codec dependent method as per
bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1273
* tif_win32.c: Fixed problem with offset value manipulation as per bug
http://bugzilla.remotesensing.org/show_bug.cgi?id=1322
* tif_fax3.c, tif_next.c, tif_pixarlog.c: Fixed multiple
vulnerabilities, as per Gentoo bug ():
http://bugs.gentoo.org/show_bug.cgi?id=142383
* tif_lzw.c, tif_zip.c: Fixed problems with mixing encoding and decoding
on the same read-write TIFF handle. The LZW code can now maintain
encode and decode state at the same time. The ZIP code will switch
back and forth as needed.
http://bugzilla.remotesensing.org/show_bug.cgi?id=757
* tif_msdos.c: Avoid handle leak for failed opens. c/o Thierry Pierron
* tif_dirwrite.c: take care not to flush out buffer of strip/tile data
in _TIFFWriteDirectory if TIFF_BEENWRITING not set. Relates to bug
report by Peng Gao with black strip at bottom of images.
* tif_dirwrite.c: make sure to use uint32 for wordcount in
TIFFWriteNormanTag if writecount is VARIABLE2 for ASCII fields. It
already seems to have been done for other field types. Needed for
"tiffset" on files with geotiff ascii text.
* tif_dirinfo.c: Added missed EXIF tag ColorSpace (40961).
* tif_dirread.c: Move IFD fetching code in the separate function
TIFFFetchDirectory() avoiding code duplication in TIFFReadDirectory()
and TIFFReadCustomDirectory().
* tif_readdir.c: Added case in EstimateStripByteCounts() for tiled
files. Modified TIFFReadDirectory() to not invoke
EstimateStripByteCounts() for case where entry 0 and 1 are unequal but
one of them is zero.
http://bugzilla.remotesensing.org/show_bug.cgi?id=1204
* tif_open.c, tif_dirread.c, tiffiop.h: Move IFD looping checking code
in the separate function TIFFCheckDirOffset().
* tif_aux.c: Added _TIFFCheckRealloc() function.
* tif_fax3.c: Fixed problems in fax decoder as per bug
http://bugzilla.remotesensing.org/show_bug.cgi?id=1194
* tif_jbig.c: Added support for JBIG compression scheme (34661 code)
contributed by Lee Howard. As per bug
http://bugzilla.remotesensing.org/show_bug.cgi?id=896
* tif_getimage.c: Added support for planarconfig separate non-subsampled
YCbCr (i.e. separate YCbCr with subsampling [1,1]).
* tif_getimage.c: Revision of all RGB(A) put routines:
* Conversion of unassociated alpha to associated alpha now done
with more performant LUT, and calculation more correct.
* Conversion of 16bit data to 8bit data now done with more
performant LUT, and calculation more correct
* Bugfix of handling of 16bit RGB with unassociated alpha
* tif_ojpeg.c: totally new implementation
* tif_getimage.c: removed TIFFTAG_JPEGCOLORMODE handling of OJPEG images
in favor of tif_getimage.c native handling of YCbCr and desubsampling.
* tif_jpeg.c: JPEGVSetField() so that altering the photometric
interpretation causes the "upsampled" flag to be recomputed. Fixes
peculiar bug where photometric flag had to be set before jpegcolormode
flag.
------------------------------------------------
CHANGES IN THE TOOLS:
* tiff2ps.c: Added support 16-bit images as per bug
http://bugzilla.remotesensing.org/show_bug.cgi?id=1566. Patch from
William Bader.
* tiff2pdf.c: Fix for TIFFTAG_JPEGTABLES tag fetching and significant
upgrade of the whole utility as per bug
http://bugzilla.remotesensing.org/show_bug.cgi?id=1560. Now we don't
need tiffiop.h in tiff2pdf anymore and will open output PDF file using
TIFFClientOpen() machinery as it is implemented by Leon Bottou.
* tiffcrop.c: New tiffcrop utility contributed by Richard Nolde. As per
bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1383
* tiff2pdf.c: Do not assume inches when the resolution units do not
specified. As per bug
http://bugzilla.remotesensing.org/show_bug.cgi?id=1366
* tiffset.c: Properly handle tags with TIFF_VARIABLE writecount. As per
bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1350
* tif2rgba.c: This utility does not work properly on big-endian
architectures. It was fixed including the bug
http://bugzilla.remotesensing.org/show_bug.cgi?id=1149
* tiff2pdf.c: Fix handling of -q values.
http://bugzilla.remotesensing.org/show_bug.cgi?id=587
* tiffcmp.c: Fixed floating point comparison logic as per bug
http://bugzilla.remotesensing.org/show_bug.cgi?id=1191
* tiff2pdf.c: Fixed buffer overflow condition in t2p_write_pdf_string()
as per bug http://bugzilla.remotesensing.org/show_bug.cgi?id=1196
------------------------------------------------
CHANGES IN THE CONTRIB AREA:
* contrib/addtiffo/tif_overview.c: Fix problems with odd sized output
blocks in TIFF_DownSample_Subsampled() (bug 1542).
* contrib/dbs/xtiff/xtiff.c: Make xtiff utility compilable. Though it is
still far from the state of being working and useful.
diffstat:
graphics/tiff/Makefile | 11 +-
graphics/tiff/PLIST | 7 +-
graphics/tiff/distinfo | 23 +--
graphics/tiff/patches/patch-aa | 17 --
graphics/tiff/patches/patch-ab | 26 ---
graphics/tiff/patches/patch-ac | 77 ----------
graphics/tiff/patches/patch-at | 122 ----------------
graphics/tiff/patches/patch-au | 15 -
graphics/tiff/patches/patch-av | 103 -------------
graphics/tiff/patches/patch-aw | 26 ---
graphics/tiff/patches/patch-ax | 308 -----------------------------------------
graphics/tiff/patches/patch-ay | 29 ---
graphics/tiff/patches/patch-az | 119 ---------------
graphics/tiff/patches/patch-ba | 24 ---
graphics/tiff/patches/patch-bb | 27 ---
graphics/tiff/patches/patch-bc | 37 ----
graphics/tiff/patches/patch-ca | 47 ------
graphics/tiff/patches/patch-cb | 126 ----------------
18 files changed, 18 insertions(+), 1126 deletions(-)
diffs (truncated from 1263 to 300 lines):
diff -r 08467fcb2b1f -r 2a69cfa631ff graphics/tiff/Makefile
--- a/graphics/tiff/Makefile Mon Aug 24 08:23:41 2009 +0000
+++ b/graphics/tiff/Makefile Mon Aug 24 08:50:33 2009 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.88 2009/07/19 11:45:09 tron Exp $
+# $NetBSD: Makefile,v 1.89 2009/08/24 08:50:33 wiz Exp $
-DISTNAME= tiff-3.8.2
-PKGREVISION= 6
+DISTNAME= tiff-3.9.0
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \
http://libtiff.maptools.org/dl/
@@ -26,6 +25,12 @@
TEST_TARGET= check
+post-install:
+ cd ${DESTDIR}/${PREFIX}/${PKGMANDIR}/man3 && for file in *.3tiff; do\
+ target=`echo $$file | sed "s/3tiff/3/"`; \
+ ${MV} $$file $$target; \
+ done
+
.include "options.mk"
.include "../../devel/zlib/buildlink3.mk"
diff -r 08467fcb2b1f -r 2a69cfa631ff graphics/tiff/PLIST
--- a/graphics/tiff/PLIST Mon Aug 24 08:23:41 2009 +0000
+++ b/graphics/tiff/PLIST Mon Aug 24 08:50:33 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:59:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/08/24 08:50:33 wiz Exp $
bin/bmp2tiff
bin/fax2ps
bin/fax2tiff
@@ -15,6 +15,7 @@
bin/tiff2rgba
bin/tiffcmp
bin/tiffcp
+bin/tiffcrop
bin/tiffdither
bin/tiffdump
bin/tiffinfo
@@ -45,6 +46,7 @@
man/man1/tiff2rgba.1
man/man1/tiffcmp.1
man/man1/tiffcp.1
+man/man1/tiffcrop.1
man/man1/tiffdither.1
man/man1/tiffdump.1
man/man1/tiffgt.1
@@ -94,6 +96,7 @@
share/doc/tiff/COPYRIGHT
share/doc/tiff/ChangeLog
share/doc/tiff/README
+share/doc/tiff/README.vms
share/doc/tiff/RELEASE-DATE
share/doc/tiff/TODO
share/doc/tiff/VERSION
@@ -179,6 +182,7 @@
share/doc/tiff/html/man/tiff2rgba.1.html
share/doc/tiff/html/man/tiffcmp.1.html
share/doc/tiff/html/man/tiffcp.1.html
+share/doc/tiff/html/man/tiffcrop.1.html
share/doc/tiff/html/man/tiffdither.1.html
share/doc/tiff/html/man/tiffdump.1.html
share/doc/tiff/html/man/tiffgt.1.html
@@ -222,3 +226,4 @@
share/doc/tiff/html/v3.8.0.html
share/doc/tiff/html/v3.8.1.html
share/doc/tiff/html/v3.8.2.html
+share/doc/tiff/html/v3.9.0beta.html
diff -r 08467fcb2b1f -r 2a69cfa631ff graphics/tiff/distinfo
--- a/graphics/tiff/distinfo Mon Aug 24 08:23:41 2009 +0000
+++ b/graphics/tiff/distinfo Mon Aug 24 08:50:33 2009 +0000
@@ -1,20 +1,5 @@
-$NetBSD: distinfo,v 1.43 2009/07/19 11:45:09 tron Exp $
+$NetBSD: distinfo,v 1.44 2009/08/24 08:50:33 wiz Exp $
-SHA1 (tiff-3.8.2.tar.gz) = 549e67b6a15b42bfcd72fe17cda7c9a198a393eb
-RMD160 (tiff-3.8.2.tar.gz) = 1b4d825e3be08764e953fc58246d0c25ab4dd17d
-Size (tiff-3.8.2.tar.gz) = 1336295 bytes
-SHA1 (patch-aa) = edac79a6f3b61e9fc787fe14f750d88023a29bfa
-SHA1 (patch-ab) = b517cb8bc2212d3e6c5a70db1bdf45b85b78fc72
-SHA1 (patch-ac) = 24bb2d78d63df7f02d128c7dc6a4c8db50fac891
-SHA1 (patch-at) = 4006ed90f6ab88aff30e2537d613a1b44b5c7347
-SHA1 (patch-au) = c53ed7521c3918081526ad63cd0c1c45c9a0b9ff
-SHA1 (patch-av) = 38852ef5028f6c0ad7a3e5497248f264f0cb7366
-SHA1 (patch-aw) = 8df07a9bc23092cfde2b364a1965efcfdc848b1e
-SHA1 (patch-ax) = 1a111d7a80bf98a650d147c035cd719d34aafc8a
-SHA1 (patch-ay) = db50f1d97b5d3b94e4d470b49642fe105977e0b7
-SHA1 (patch-az) = ec57ebacc6052221ae63084d23c7c7b4aea029d8
-SHA1 (patch-ba) = d4bd9c67a9bf2be93286f8268ac520c4b88ba3ae
-SHA1 (patch-bb) = cbc7feda655a02809de55be6470cc25cda942a08
-SHA1 (patch-bc) = 9baa1c138cd3cb6366ae3e638518b94dfea172cc
-SHA1 (patch-ca) = 3c90d9735f0586632db05ceb50b336cbfdf279b6
-SHA1 (patch-cb) = 349c8764091d69f5eca84588837022d218b2165c
+SHA1 (tiff-3.9.0.tar.gz) = e525879da8416e00ccd58617b2850341a429e23c
+RMD160 (tiff-3.9.0.tar.gz) = be5bdb33c30a23fd0969981bfda1fe8e79f8879f
+Size (tiff-3.9.0.tar.gz) = 1399851 bytes
diff -r 08467fcb2b1f -r 2a69cfa631ff graphics/tiff/patches/patch-aa
--- a/graphics/tiff/patches/patch-aa Mon Aug 24 08:23:41 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.17 2005/07/14 13:43:28 wiz Exp $
-
---- man/Makefile.in.orig 2005-07-05 16:38:13.000000000 +0000
-+++ man/Makefile.in
-@@ -380,11 +380,7 @@ install-man3: $(man3_MANS) $(man_MANS)
- for i in $$list; do \
- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
- else file=$$i; fi; \
-- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-- case "$$ext" in \
-- 3*) ;; \
-- *) ext='3' ;; \
-- esac; \
-+ ext='3'; \
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
diff -r 08467fcb2b1f -r 2a69cfa631ff graphics/tiff/patches/patch-ab
--- a/graphics/tiff/patches/patch-ab Mon Aug 24 08:23:41 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.18 2006/02/20 17:56:36 joerg Exp $
-
---- libtiff/tiffio.h.orig 2006-02-20 17:43:42.000000000 +0000
-+++ libtiff/tiffio.h
-@@ -30,6 +30,10 @@
- /*
- * TIFF I/O Library Definitions.
- */
-+
-+/* NULL */
-+#include <stddef.h>
-+
- #include "tiff.h"
- #include "tiffvers.h"
-
-@@ -97,10 +101,6 @@ typedef HFILE thandle_t; /* client data
- typedef void* thandle_t; /* client data handle */
- #endif /* USE_WIN32_FILEIO */
-
--#ifndef NULL
--# define NULL (void *)0
--#endif
--
- /*
- * Flags to pass to TIFFPrintDirectory to control
- * printing of data structures that are potentially
diff -r 08467fcb2b1f -r 2a69cfa631ff graphics/tiff/patches/patch-ac
--- a/graphics/tiff/patches/patch-ac Mon Aug 24 08:23:41 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-$NetBSD: patch-ac,v 1.20 2009/06/22 14:54:44 drochner Exp $
-
---- libtiff/tif_lzw.c.orig 2006-03-21 17:42:50.000000000 +0100
-+++ libtiff/tif_lzw.c
-@@ -237,6 +237,13 @@ LZWSetupDecode(TIFF* tif)
- sp->dec_codetab[code].length = 1;
- sp->dec_codetab[code].next = NULL;
- } while (code--);
-+ /*
-+ * Zero-out the unused entries
-+ */
-+ _TIFFmemset(&sp->dec_codetab[CODE_CLEAR], 0,
-+ (CODE_FIRST-CODE_CLEAR)*sizeof (code_t));
-+
-+
- }
- return (1);
- }
-@@ -408,12 +415,20 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize
- break;
- if (code == CODE_CLEAR) {
- free_entp = sp->dec_codetab + CODE_FIRST;
-+ _TIFFmemset(free_entp, 0, (CSIZE-CODE_FIRST)*sizeof (code_t));
- nbits = BITS_MIN;
- nbitsmask = MAXCODE(BITS_MIN);
- maxcodep = sp->dec_codetab + nbitsmask-1;
- NextCode(tif, sp, bp, code, GetNextCode);
- if (code == CODE_EOI)
- break;
-+ if (code == CODE_CLEAR) {
-+ TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
-+ "LZWDecode: Corrupted LZW table at scanline %d",
-+ tif->tif_row);
-+ return (0);
-+ }
-+
- *op++ = (char)code, occ--;
- oldcodep = sp->dec_codetab + code;
- continue;
-@@ -604,12 +619,20 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0,
- break;
- if (code == CODE_CLEAR) {
- free_entp = sp->dec_codetab + CODE_FIRST;
-+ _TIFFmemset(free_entp, 0, (CSIZE-CODE_FIRST)*sizeof (code_t));
- nbits = BITS_MIN;
- nbitsmask = MAXCODE(BITS_MIN);
- maxcodep = sp->dec_codetab + nbitsmask;
- NextCode(tif, sp, bp, code, GetNextCodeCompat);
- if (code == CODE_EOI)
- break;
-+ if (code == CODE_CLEAR) {
-+ TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
-+ "LZWDecode: Corrupted LZW table at scanline %d",
-+ tif->tif_row);
-+ return (0);
-+ }
-+
- *op++ = code, occ--;
- oldcodep = sp->dec_codetab + code;
- continue;
-@@ -647,6 +670,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0,
- }
- oldcodep = codep;
- if (code >= 256) {
-+ char *op_orig = op;
- /*
- * Code maps to a string, copy string
- * value to output (written in reverse).
-@@ -681,7 +705,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0,
- tp = op;
- do {
- *--tp = codep->value;
-- } while( (codep = codep->next) != NULL);
-+ } while( (codep = codep->next) != NULL && tp > op_orig);
- } else
- *op++ = code, occ--;
- }
diff -r 08467fcb2b1f -r 2a69cfa631ff graphics/tiff/patches/patch-at
--- a/graphics/tiff/patches/patch-at Mon Aug 24 08:23:41 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-$NetBSD: patch-at,v 1.6 2006/03/14 14:08:30 drochner Exp $
-
---- configure.orig 2006-03-13 15:58:42.000000000 +0100
-+++ configure
-@@ -12439,6 +12439,117 @@ done
-
-
-
-+for ac_func in lfind
-+do
-+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+if eval "test \"\${$as_ac_var+set}\" = set"; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
-+#define $ac_func innocuous_$ac_func
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+ which can conflict with char $ac_func (); below.
-+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+ <limits.h> exists even on freestanding compilers. */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef $ac_func
-+
-+/* Override any gcc2 internal prototype to avoid an error. */
-+#ifdef __cplusplus
-+extern "C"
-+{
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+ builtin and then its argument prototype would still apply. */
-+char $ac_func ();
-+/* The GNU C library defines this for functions which it implements
-+ to always fail with ENOSYS. Some functions are actually named
-+ something starting with __ and the normal name is an alias. */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+char (*f) () = $ac_func;
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+int
-+main ()
-+{
-+return f != $ac_func;
-+ ;
Home |
Main Index |
Thread Index |
Old Index