- update to 3.7.1

3 files changed, 16 insertions, 60 deletions

diff --git a/graphics/tiff/files/patch-Makefile.in b/graphics/tiff/files/patch-Makefile.in
new file mode 100644
index 000000000000..5234a63a9a73
--- /dev/null
+++ b/graphics/tiff/files/patch-Makefile.in
@@ -0,0 +1,16 @@
+--- Makefile.in.orig	Mon Dec 20 20:41:46 2004
++++ Makefile.in	Wed Dec 22 08:02:37 2004
+@@ -302,13 +302,6 @@
+ uninstall-info-am:
+ install-dist_docDATA: $(dist_doc_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
+-	@list='$(dist_doc_DATA)'; for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f=$(am__strip_dir) \
+-	  echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+-	  $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+-	done
+ 
+ uninstall-dist_docDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/graphics/tiff/files/patch-tif_color.c b/graphics/tiff/files/patch-tif_color.c
deleted file mode 100644
index 9288d85ff565..000000000000
--- a/graphics/tiff/files/patch-tif_color.c
+++ /dev/null
@@ -1,43 +0,0 @@
-*** libtiff/tif_color.c.ref	Fri Nov  5 18:01:44 2004
---- libtiff/tif_color.c	Fri Nov  5 18:26:46 2004
-***************
-*** 170,176 ****
-  #define	SHIFT			16
-  #define	FIX(x)			((int32)((x) * (1L<<SHIFT) + 0.5))
-  #define	ONE_HALF		((int32)(1<<(SHIFT-1)))
-! #define	Code2V(c, RB, RW, CR)	((((c)-(int32)(RB))*(float)(CR))/(float)((RW)-(RB)))
-  #define	CLAMP(f,min,max)	((f)<(min)?(min):(f)>(max)?(max):(f))
-  
-  void
---- 170,176 ----
-  #define	SHIFT			16
-  #define	FIX(x)			((int32)((x) * (1L<<SHIFT) + 0.5))
-  #define	ONE_HALF		((int32)(1<<(SHIFT-1)))
-! #define	Code2V(c, RB, RW, CR)	((((c)-(int32)(RB))*(float)(CR))/(float)(((RW)-(RB)) ? ((RW)-(RB)) : 1))
-  #define	CLAMP(f,min,max)	((f)<(min)?(min):(f)>(max)?(max):(f))
-  
-  void
-***************
-*** 243,252 ****
-         * constructing tables indexed by the raw pixel data.
-         */
-        for (i = 0, x = -128; i < 256; i++, x++) {
-! 	    int32 Cr = (int32)Code2V(x, refBlackWhite[4] - 128.0F,
-! 			    refBlackWhite[5] - 128.0F, 127);
-! 	    int32 Cb = (int32)Code2V(x, refBlackWhite[2] - 128.0F,
-! 			    refBlackWhite[3] - 128.0F, 127);
-  
-  	    ycbcr->Cr_r_tab[i] = (int32)((D1*Cr + ONE_HALF)>>SHIFT);
-  	    ycbcr->Cb_b_tab[i] = (int32)((D3*Cb + ONE_HALF)>>SHIFT);
---- 243,252 ----
-         * constructing tables indexed by the raw pixel data.
-         */
-        for (i = 0, x = -128; i < 256; i++, x++) {
-! 	    int32 Cr = ((int32)Code2V(x, refBlackWhite[4] - 128.0F,
-! 			    refBlackWhite[5] - 128.0F, 255)) - 128;
-! 	    int32 Cb = ((int32)Code2V(x, refBlackWhite[2] - 128.0F,
-! 			    refBlackWhite[3] - 128.0F, 255)) - 128;
-  
-  	    ycbcr->Cr_r_tab[i] = (int32)((D1*Cr + ONE_HALF)>>SHIFT);
-  	    ycbcr->Cb_b_tab[i] = (int32)((D3*Cb + ONE_HALF)>>SHIFT);
-
diff --git a/graphics/tiff/files/patch-tiff2ps.c b/graphics/tiff/files/patch-tiff2ps.c
deleted file mode 100644
index 5178a026aa35..000000000000
--- a/graphics/tiff/files/patch-tiff2ps.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- tools/tiff2ps.c	Thu Oct 14 13:53:28 2004
-+++ tools/tiff2ps.c	Mon Nov 15 10:05:30 2004
-@@ -412,5 +412,5 @@
- setupPageState(TIFF* tif, uint32* pw, uint32* ph, double* pprw, double* pprh)
- {
--	double xres = 0.0, yres = 0.0;
-+	float xres = 0.0, yres = 0.0;
- 
- 	TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, pw);
-@@ -543,5 +543,6 @@
- {
- 	uint32 w, h;
--	double ox, oy, prw, prh;
-+	float ox, oy;
-+	double prw, prh;
- 	double scale = 1.0;
- 	double left_offset = lm * PS_UNIT_SIZE;