moved into main repo for pisi 2.0
This commit is contained in:
@@ -0,0 +1,13 @@
|
||||
--- libtiff/tif_dir.c 2011-04-04 05:58:54.000000000 -0400
|
||||
+++ libtiff/tif_dir.c.oden 2011-04-04 05:59:08.000000000 -0400
|
||||
@@ -370,6 +370,10 @@ _TIFFVSetField(TIFF* tif, ttag_t tag, va
|
||||
case TIFFTAG_YCBCRSUBSAMPLING:
|
||||
td->td_ycbcrsubsampling[0] = (uint16) va_arg(ap, int);
|
||||
td->td_ycbcrsubsampling[1] = (uint16) va_arg(ap, int);
|
||||
+ if (td->td_ycbcrsubsampling[0] > 4)
|
||||
+ td->td_ycbcrsubsampling[0] = (td->td_compression == 7) ? 1 : 2;
|
||||
+ if (td->td_ycbcrsubsampling[1] > 4)
|
||||
+ td->td_ycbcrsubsampling[1] = (td->td_compression == 7) ? 1 : 2;
|
||||
break;
|
||||
case TIFFTAG_TRANSFERFUNCTION:
|
||||
v = (td->td_samplesperpixel - td->td_extrasamples) > 1 ? 3 : 1;
|
||||
@@ -0,0 +1,24 @@
|
||||
diff -Naur tiff-3.9.1/Makefile.am tiff-3.9.1.oden/Makefile.am
|
||||
--- tiff-3.9.1/Makefile.am 2009-08-21 18:46:01.000000000 +0200
|
||||
+++ tiff-3.9.1.oden/Makefile.am 2009-08-30 12:43:13.000000000 +0200
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
dist_doc_DATA = $(docfiles)
|
||||
|
||||
-SUBDIRS = port libtiff tools build contrib test man html
|
||||
+SUBDIRS = port libtiff tools build test man html
|
||||
|
||||
release:
|
||||
(rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE)
|
||||
diff -Naur tiff-3.9.1/Makefile.in tiff-3.9.1.oden/Makefile.in
|
||||
--- tiff-3.9.1/Makefile.in 2009-08-28 20:41:13.000000000 +0200
|
||||
+++ tiff-3.9.1.oden/Makefile.in 2009-08-30 12:43:33.000000000 +0200
|
||||
@@ -331,7 +331,7 @@
|
||||
nmake.opt
|
||||
|
||||
dist_doc_DATA = $(docfiles)
|
||||
-SUBDIRS = port libtiff tools build contrib test man html
|
||||
+SUBDIRS = port libtiff tools build test man html
|
||||
all: all-recursive
|
||||
|
||||
.SUFFIXES:
|
||||
@@ -0,0 +1,10 @@
|
||||
--- libtiff/tif_jpeg.c 2010-09-30 13:43:31.045146032 +0200
|
||||
+++ libtiff/tif_jpeg.c.oden 2010-09-30 13:44:59.005141117 +0200
|
||||
@@ -850,6 +850,7 @@ JPEGPreDecode(TIFF* tif, tsample_t s)
|
||||
if (downsampled_output) {
|
||||
/* Need to use raw-data interface to libjpeg */
|
||||
sp->cinfo.d.raw_data_out = TRUE;
|
||||
+ sp->cinfo.d.do_fancy_upsampling = FALSE;
|
||||
tif->tif_decoderow = JPEGDecodeRaw;
|
||||
tif->tif_decodestrip = JPEGDecodeRaw;
|
||||
tif->tif_decodetile = JPEGDecodeRaw;
|
||||
Reference in New Issue
Block a user