rpms/libtiff/devel libtiff-3.7.2-persample.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 libtiff.spec, 1.29, 1.30 sources, 1.5, 1.6 libtiff-3.5.7-dump.patch, 1.1, NONE libtiff-3.7.1-extrasamples.patch, 1.1, NONE libtiff-3.7.1-mktemp.patch, 1.1, NONE libtiff-3.7.1-persample.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jun 29 15:59:53 UTC 2005
- Previous message (by thread): rpms/system-config-display/devel system-config-display.spec, 1.23, 1.24
- Next message (by thread): rpms/kde-i18n/devel .cvsignore, 1.24, 1.25 kde-i18n.spec, 1.36, 1.37 sources, 1.25, 1.26 subdirs-kde-i18n, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mclasen
Update of /cvs/dist/rpms/libtiff/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv403
Modified Files:
.cvsignore libtiff.spec sources
Added Files:
libtiff-3.7.2-persample.patch
Removed Files:
libtiff-3.5.7-dump.patch libtiff-3.7.1-extrasamples.patch
libtiff-3.7.1-mktemp.patch libtiff-3.7.1-persample.patch
Log Message:
Update to 3.7.2
libtiff-3.7.2-persample.patch:
tif_dirread.c | 168 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 90 insertions(+), 78 deletions(-)
--- NEW FILE libtiff-3.7.2-persample.patch ---
--- tiff-3.7.2/libtiff/tif_dirread.c.persample 2005-03-05 04:06:00.000000000 -0500
+++ tiff-3.7.2/libtiff/tif_dirread.c 2005-06-29 11:54:31.536319000 -0400
@@ -1303,33 +1303,37 @@
static int
TIFFFetchPerSampleShorts(TIFF* tif, TIFFDirEntry* dir, uint16* pl)
{
- uint16 samples = tif->tif_dir.td_samplesperpixel;
- int status = 0;
+ uint16 samples = tif->tif_dir.td_samplesperpixel;
+ int status = 0;
- if (CheckDirCount(tif, dir, (uint32) samples)) {
- uint16 buf[10];
- uint16* v = buf;
-
- if (samples > NITEMS(buf))
- v = (uint16*) CheckMalloc(tif, samples, sizeof(uint16),
- "to fetch per-sample values");
- if (v && TIFFFetchShortArray(tif, dir, v)) {
- uint16 i;
- for (i = 1; i < samples; i++)
- if (v[i] != v[0]) {
- TIFFError(tif->tif_name,
- "Cannot handle different per-sample values for field \"%s\"",
- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
- goto bad;
- }
- *pl = v[0];
- status = 1;
- }
- bad:
- if (v && v != buf)
- _TIFFfree(v);
- }
- return (status);
+ if (CheckDirCount(tif, dir, (uint32) samples)) {
+ uint16 buf[10];
+ uint16* v = buf;
+
+ if (dir->tdir_count > NITEMS(buf))
+ v = (uint16*) CheckMalloc(tif, dir->tdir_count, sizeof(uint16),
+ "to fetch per-sample values");
+ if (v && TIFFFetchShortArray(tif, dir, v)) {
+ uint16 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\"",
+ _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+ goto bad;
+ }
+ *pl = v[0];
+ status = 1;
+ }
+ bad:
+ if (v && v != buf)
+ _TIFFfree(v);
+ }
+ return (status);
}
/*
@@ -1340,33 +1344,37 @@
static int
TIFFFetchPerSampleLongs(TIFF* tif, TIFFDirEntry* dir, uint32* pl)
{
- uint16 samples = tif->tif_dir.td_samplesperpixel;
- int status = 0;
+ uint16 samples = tif->tif_dir.td_samplesperpixel;
+ int status = 0;
- if (CheckDirCount(tif, dir, (uint32) samples)) {
- uint32 buf[10];
- uint32* v = buf;
-
- if (samples > NITEMS(buf))
- v = (uint32*) CheckMalloc(tif, samples, sizeof(uint32),
- "to fetch per-sample values");
- if (v && TIFFFetchLongArray(tif, dir, v)) {
- uint16 i;
- for (i = 1; i < samples; i++)
- if (v[i] != v[0]) {
- TIFFError(tif->tif_name,
- "Cannot handle different per-sample values for field \"%s\"",
- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
- goto bad;
- }
- *pl = v[0];
- status = 1;
- }
- bad:
- if (v && v != buf)
- _TIFFfree(v);
- }
- return (status);
+ if (CheckDirCount(tif, dir, (uint32) samples)) {
+ uint32 buf[10];
+ uint32* v = buf;
+
+ if (dir->tdir_count > NITEMS(buf))
+ v = (uint32*) CheckMalloc(tif, dir->tdir_count, sizeof(uint32),
+ "to fetch per-sample values");
+ if (v && TIFFFetchLongArray(tif, dir, v)) {
+ uint16 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\"",
+ _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+ goto bad;
+ }
+ *pl = v[0];
+ status = 1;
+ }
+ bad:
+ if (v && v != buf)
+ _TIFFfree(v);
+ }
+ return (status);
}
/*
@@ -1377,33 +1385,37 @@
static int
TIFFFetchPerSampleAnys(TIFF* tif, TIFFDirEntry* dir, double* pl)
{
- uint16 samples = tif->tif_dir.td_samplesperpixel;
- int status = 0;
+ uint16 samples = tif->tif_dir.td_samplesperpixel;
+ int status = 0;
- if (CheckDirCount(tif, dir, (uint32) samples)) {
- double buf[10];
- double* v = buf;
-
- if (samples > NITEMS(buf))
- v = (double*) CheckMalloc(tif, samples, sizeof (double),
- "to fetch per-sample values");
- if (v && TIFFFetchAnyArray(tif, dir, v)) {
- uint16 i;
- for (i = 1; i < samples; i++)
- if (v[i] != v[0]) {
- TIFFError(tif->tif_name,
- "Cannot handle different per-sample values for field \"%s\"",
- _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
- goto bad;
- }
- *pl = v[0];
- status = 1;
- }
- bad:
- if (v && v != buf)
- _TIFFfree(v);
- }
- return (status);
+ if (CheckDirCount(tif, dir, (uint32) samples)) {
+ double buf[10];
+ double* v = buf;
+
+ if (dir->tdir_count > NITEMS(buf))
+ v = (double*) CheckMalloc(tif, dir->tdir_count, sizeof (double),
+ "to fetch per-sample values");
+ if (v && TIFFFetchAnyArray(tif, dir, v)) {
+ uint16 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\"",
+ _TIFFFieldWithTag(tif, dir->tdir_tag)->field_name);
+ goto bad;
+ }
+ *pl = v[0];
+ status = 1;
+ }
+ bad:
+ if (v && v != buf)
+ _TIFFfree(v);
+ }
+ return (status);
}
#undef NITEMS
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libtiff/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 22 Dec 2004 17:50:34 -0000 1.5
+++ .cvsignore 29 Jun 2005 15:59:43 -0000 1.6
@@ -1,2 +1,3 @@
tiff-v3.6.1.tar.gz
tiff-3.7.1.tar.gz
+tiff-3.7.2.tar.gz
Index: libtiff.spec
===================================================================
RCS file: /cvs/dist/rpms/libtiff/devel/libtiff.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- libtiff.spec 6 May 2005 14:48:39 -0000 1.29
+++ libtiff.spec 29 Jun 2005 15:59:43 -0000 1.30
@@ -1,17 +1,13 @@
Summary: A library of functions for manipulating TIFF format image files.
Name: libtiff
-Version: 3.7.1
-Release: 6
+Version: 3.7.2
+Release: 1
License: distributable
Group: System Environment/Libraries
Source0: http://www.libtiff.org/tiff-%{version}.tar.gz
Patch0: libtiff-v3.6.1-64bit.patch
-Patch1: libtiff-3.5.7-dump.patch
-# http://bugzilla.remotesensing.org/show_bug.cgi?id=718, fixed in 3.7.2
-Patch2: libtiff-3.7.1-extrasamples.patch
-Patch3: libtiff-3.7.1-mktemp.patch
# http://bugzilla.remotesensing.org/show_bug.cgi?id=843, fixed in 3.7.3
-Patch4: libtiff-3.7.1-persample.patch
+Patch1: libtiff-3.7.2-persample.patch
URL: http://www.libtiff.org/
BuildRoot: %{_tmppath}/%{name}-root
BuildRequires: zlib-devel zlib libjpeg-devel libjpeg
@@ -45,10 +41,7 @@
%setup -q -n tiff-%{version}
%patch0 -p1 -b .64bit
-%patch1 -p1 -b .dump
-%patch2 -p1 -b .extrasamples
-%patch3 -p1 -b .mktemp
-%patch4 -p1 -b .persample
+%patch1 -p1 -b .persample
%build
@@ -87,6 +80,10 @@
%{_mandir}/man3/*
%changelog
+* Wed Jun 29 2005 Matthias Clasen <mclasen at redhat.com> - 3.7.2-1
+- Update to 3.7.2
+- Drop upstreamed patches
+
* Fri May 6 2005 Matthias Clasen <mclasen at redhat.com> - 3.7.1-6
- Fix a stack overflow
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libtiff/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 22 Dec 2004 17:50:34 -0000 1.5
+++ sources 29 Jun 2005 15:59:43 -0000 1.6
@@ -1 +1 @@
-37d222df12eb23691614cd40b7b1f215 tiff-3.7.1.tar.gz
+9d7123bd0dbde2a3853fb758346adb78 tiff-3.7.2.tar.gz
--- libtiff-3.5.7-dump.patch DELETED ---
--- libtiff-3.7.1-extrasamples.patch DELETED ---
--- libtiff-3.7.1-mktemp.patch DELETED ---
--- libtiff-3.7.1-persample.patch DELETED ---
- Previous message (by thread): rpms/system-config-display/devel system-config-display.spec, 1.23, 1.24
- Next message (by thread): rpms/kde-i18n/devel .cvsignore, 1.24, 1.25 kde-i18n.spec, 1.36, 1.37 sources, 1.25, 1.26 subdirs-kde-i18n, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list