From: Jiyong Min <jiyong.min@samsung.com>
Date: Fri, 20 Apr 2018 02:19:50 +0000 (+0900)
Subject: Imported Upstream version 4.0.9 from branch 'origin/upstream' into tizen
X-Git-Tag: accepted/tizen/unified/20180424.082605~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F42%2F176542%2F1;p=platform%2Fupstream%2Ftiff.git

Imported Upstream version 4.0.9 from branch 'origin/upstream' into tizen

Conflicts:
	ChangeLog
	libtiff/tif_dirread.c
	libtiff/tif_luv.c
	libtiff/tif_ojpeg.c
	libtiff/tif_pixarlog.c
	libtiff/tif_read.c
	libtiff/tiffiop.h
	tools/tiffcp.c

Change-Id: I1935e168a483153ec40a8f17a39ba4964178b694
---

a45afb5e87127e6392c56c8d185312bf4b86aa2c
diff --cc ChangeLog
index 893fa24,ea8622b..ea8622b
mode 100755,100644..100755
--- a/ChangeLog
+++ b/ChangeLog
diff --cc libtiff/tif_dirread.c
index b984e0c,5e62e81..5e62e81
mode 100755,100644..100755
--- a/libtiff/tif_dirread.c
+++ b/libtiff/tif_dirread.c
diff --cc libtiff/tif_luv.c
index a3b73cc,4b25244..4b25244
mode 100755,100644..100755
--- a/libtiff/tif_luv.c
+++ b/libtiff/tif_luv.c
diff --cc libtiff/tif_ojpeg.c
index 01b672a,92ed1fa..92ed1fa
mode 100755,100644..100755
--- a/libtiff/tif_ojpeg.c
+++ b/libtiff/tif_ojpeg.c
diff --cc libtiff/tif_pixarlog.c
index d3e1f61,979858d..979858d
mode 100755,100644..100755
--- a/libtiff/tif_pixarlog.c
+++ b/libtiff/tif_pixarlog.c
diff --cc libtiff/tif_read.c
index 20def61,2ba985a..2ba985a
mode 100755,100644..100755
--- a/libtiff/tif_read.c
+++ b/libtiff/tif_read.c
diff --cc libtiff/tif_strip.c
index 3b55285,6e9f2ef..6e9f2ef
mode 100755,100644..100755
--- a/libtiff/tif_strip.c
+++ b/libtiff/tif_strip.c
diff --cc libtiff/tiffiop.h
index 20e6449,daa291c..daa291c
mode 100755,100644..100755
--- a/libtiff/tiffiop.h
+++ b/libtiff/tiffiop.h
diff --cc tools/tiff2pdf.c
index fe8a6ea,454befb..454befb
mode 100755,100644..100755
--- a/tools/tiff2pdf.c
+++ b/tools/tiff2pdf.c
diff --cc tools/tiffcp.c
index 2fe68fc,489459a..489459a
mode 100755,100644..100755
--- a/tools/tiffcp.c
+++ b/tools/tiffcp.c
diff --cc tools/tiffcrop.c
index ad2c00f,c69177e..c69177e
mode 100755,100644..100755
--- a/tools/tiffcrop.c
+++ b/tools/tiffcrop.c