summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Arnold <nerdboy@gentoo.org>2010-09-18 18:39:13 +0000
committerSteve Arnold <nerdboy@gentoo.org>2010-09-18 18:39:13 +0000
commit2244494bd346f55673d898cdc7361dc617e4ac64 (patch)
treefe853670b37844247388c41d8cc43867316c1f3c /media-libs/tiff/files
parentalpha/sparc stable wrt #333207 (diff)
downloadhistorical-2244494bd346f55673d898cdc7361dc617e4ac64.tar.gz
historical-2244494bd346f55673d898cdc7361dc617e4ac64.tar.bz2
historical-2244494bd346f55673d898cdc7361dc617e4ac64.zip
Added upstream patch for CR2 files and enabled 12/8-bit jpeg compression
(closes bug 336114). Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-libs/tiff/files')
-rw-r--r--media-libs/tiff/files/tiff-4.0.0_beta6-cr2-bitspersample.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/media-libs/tiff/files/tiff-4.0.0_beta6-cr2-bitspersample.patch b/media-libs/tiff/files/tiff-4.0.0_beta6-cr2-bitspersample.patch
new file mode 100644
index 000000000000..a1e45db195ca
--- /dev/null
+++ b/media-libs/tiff/files/tiff-4.0.0_beta6-cr2-bitspersample.patch
@@ -0,0 +1,13 @@
+diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
+index 64c39fc..60bde82 100644
+--- a/libtiff/tif_dirread.c
++++ b/libtiff/tif_dirread.c
+@@ -2727,7 +2727,7 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryPersampleShort(TIFF* tif, TIFFDi
+ uint16* m;
+ uint16* na;
+ uint16 nb;
+- if (direntry->tdir_count!=(uint64)tif->tif_dir.td_samplesperpixel)
++ if (direntry->tdir_count<(uint64)tif->tif_dir.td_samplesperpixel)
+ return(TIFFReadDirEntryErrCount);
+ err=TIFFReadDirEntryShortArray(tif,direntry,&m);
+ if (err!=TIFFReadDirEntryErrOk)