summaryrefslogtreecommitdiff
path: root/graphics/tiff/patches/patch-at
diff options
context:
space:
mode:
authorreed <reed>2004-12-28 23:10:09 +0000
committerreed <reed>2004-12-28 23:10:09 +0000
commitd5ed3fcb887b16011e0aa719e6a12cec7b64aeee (patch)
tree50f4f1570a08cc59820afbf9fe0ba56539578677 /graphics/tiff/patches/patch-at
parentc795dfd8f99058beb2bee2746ae548a80980d5b0 (diff)
downloadpkgsrc-d5ed3fcb887b16011e0aa719e6a12cec7b64aeee.tar.gz
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.)
Diffstat (limited to 'graphics/tiff/patches/patch-at')
-rw-r--r--graphics/tiff/patches/patch-at68
1 files changed, 0 insertions, 68 deletions
diff --git a/graphics/tiff/patches/patch-at b/graphics/tiff/patches/patch-at
deleted file mode 100644
index 8ae7a393d14..00000000000
--- a/graphics/tiff/patches/patch-at
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-at,v 1.1 2004/10/18 14:37:24 tron Exp $
-
---- libtiff/tif_pixarlog.c.orig 2003-07-08 08:50:09.000000000 +0200
-+++ libtiff/tif_pixarlog.c 2004-10-18 16:25:32.000000000 +0200
-@@ -630,11 +630,23 @@
- return guess;
- }
-
-+static uint32
-+multiply(size_t m1, size_t m2)
-+{
-+ uint32 bytes = m1 * m2;
-+
-+ if (m1 && bytes / m1 != m2)
-+ bytes = 0;
-+
-+ return bytes;
-+}
-+
- static int
- PixarLogSetupDecode(TIFF* tif)
- {
- TIFFDirectory *td = &tif->tif_dir;
- PixarLogState* sp = DecoderState(tif);
-+ tsize_t tbuf_size;
- static const char module[] = "PixarLogSetupDecode";
-
- assert(sp != NULL);
-@@ -647,8 +659,13 @@
-
- sp->stride = (td->td_planarconfig == PLANARCONFIG_CONTIG ?
- td->td_samplesperpixel : 1);
-- sp->tbuf = (uint16 *) _TIFFmalloc(sp->stride *
-- td->td_imagewidth * td->td_rowsperstrip * sizeof(uint16));
-+ tbuf_size = multiply(multiply(multiply(sp->stride, td->td_imagewidth),
-+ td->td_rowsperstrip), sizeof(uint16));
-+ if (tbuf_size == 0)
-+ return (0);
-+ sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size);
-+ if (sp->tbuf == NULL)
-+ return (0);
- if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN)
- sp->user_datafmt = PixarLogGuessDataFmt(td);
- if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) {
-@@ -798,6 +815,7 @@
- {
- TIFFDirectory *td = &tif->tif_dir;
- PixarLogState* sp = EncoderState(tif);
-+ tsize_t tbuf_size;
- static const char module[] = "PixarLogSetupEncode";
-
- assert(sp != NULL);
-@@ -806,8 +824,13 @@
-
- sp->stride = (td->td_planarconfig == PLANARCONFIG_CONTIG ?
- td->td_samplesperpixel : 1);
-- sp->tbuf = (uint16 *) _TIFFmalloc(sp->stride *
-- td->td_imagewidth * td->td_rowsperstrip * sizeof(uint16));
-+ tbuf_size = multiply(multiply(multiply(sp->stride, td->td_imagewidth),
-+ td->td_rowsperstrip), sizeof(uint16));
-+ if (tbuf_size == 0)
-+ return (0);
-+ sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size);
-+ if (sp->tbuf == NULL)
-+ return (0);
- if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN)
- sp->user_datafmt = PixarLogGuessDataFmt(td);
- if (sp->user_datafmt == PIXARLOGDATAFMT_UNKNOWN) {