summaryrefslogtreecommitdiff
path: root/third_party/libtiff
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/libtiff')
-rw-r--r--third_party/libtiff/0000-build-config.patch24
-rw-r--r--third_party/libtiff/tif_pixarlog.c2
-rw-r--r--third_party/libtiff/tif_zip.c2
3 files changed, 2 insertions, 26 deletions
diff --git a/third_party/libtiff/0000-build-config.patch b/third_party/libtiff/0000-build-config.patch
index 28c62f9eea..a422b37db8 100644
--- a/third_party/libtiff/0000-build-config.patch
+++ b/third_party/libtiff/0000-build-config.patch
@@ -65,30 +65,6 @@ diff a/third_party/libtiff/tif_ojpeg.c b/third_party/libtiff/tif_ojpeg.c
typedef struct jpeg_error_mgr jpeg_error_mgr;
typedef struct jpeg_common_struct jpeg_common_struct;
-diff a/third_party/libtiff/tif_pixarlog.c b/third_party/libtiff/tif_pixarlog.c
---- a/third_party/libtiff/tif_pixarlog.c
-+++ b/third_party/libtiff/tif_pixarlog.c
-@@ -90,7 +90,7 @@
- */
-
- #include "tif_predict.h"
--#include "zlib.h"
-+#include "../zlib_v1211/zlib.h"
-
- #include <stdio.h>
- #include <stdlib.h>
-diff a/third_party/libtiff/tif_zip.c b/third_party/libtiff/tif_zip.c
---- a/third_party/libtiff/tif_zip.c
-+++ b/third_party/libtiff/tif_zip.c
-@@ -47,7 +47,7 @@
- * last found at ftp://ftp.uu.net/pub/archiving/zip/zlib/zlib-0.99.tar.gz.
- */
- #include "tif_predict.h"
--#include "zlib.h"
-+#include "../zlib_v1211/zlib.h"
-
- #include <stdio.h>
-
diff a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h
--- /dev/null
+++ b/third_party/libtiff/tiffconf.h
diff --git a/third_party/libtiff/tif_pixarlog.c b/third_party/libtiff/tif_pixarlog.c
index e6574ec3df..c2903bffef 100644
--- a/third_party/libtiff/tif_pixarlog.c
+++ b/third_party/libtiff/tif_pixarlog.c
@@ -90,7 +90,7 @@
*/
#include "tif_predict.h"
-#include "../zlib_v1211/zlib.h"
+#include "zlib.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/third_party/libtiff/tif_zip.c b/third_party/libtiff/tif_zip.c
index 0625bf179f..8c35aea83d 100644
--- a/third_party/libtiff/tif_zip.c
+++ b/third_party/libtiff/tif_zip.c
@@ -47,7 +47,7 @@
* last found at ftp://ftp.uu.net/pub/archiving/zip/zlib/zlib-0.99.tar.gz.
*/
#include "tif_predict.h"
-#include "../zlib_v1211/zlib.h"
+#include "zlib.h"
#include <stdio.h>