diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/tiff/tiffmodule.cpp.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/tiff/tiffmodule.cpp --- chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/tiff/tiffmodule.cpp.pdfium-system-libtiff-libpng 2017-06-22 00:04:10.000000000 +0200 +++ chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/tiff/tiffmodule.cpp 2017-06-24 00:05:50.524671846 +0200 @@ -19,9 +19,7 @@ #include "third_party/base/logging.h" #include "third_party/base/ptr_util.h" -extern "C" { -#include "third_party/libtiff/tiffiop.h" -} // extern C +#include <tiffio.h> namespace { @@ -188,7 +186,7 @@ tiff_write, tiff_seek, tiff_close, tiff_get_size, tiff_map, tiff_unmap); if (tif) { - tif->tif_fd = (int)(intptr_t)context; + (void)TIFFSetFileno(tif, (int)(intptr_t)context); } return tif; } diff -up chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn --- chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng 2017-06-22 00:04:10.000000000 +0200 +++ chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn 2017-06-24 22:25:18.901585830 +0200 @@ -506,62 +470,13 @@ } } +config("fx_tiff_config") { + libs = [ "tiff" ] +} + if (pdf_enable_xfa_tiff) { source_set("fx_tiff") { - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ - "//build/config/compiler:no_chromium_code", - ":pdfium_third_party_config", - ] - if (is_win) { - # Need to undefine the macro since it is redefined in - # tif_ojpeg.c and tif_jpeg.c. - configs -= [ "//build/config/win:lean_and_mean" ] - } - deps = [ - ":zlib", - "../core/fxcrt", - "//third_party:jpeg", - ] - sources = [ - "libtiff/tif_aux.c", - "libtiff/tif_close.c", - "libtiff/tif_codec.c", - "libtiff/tif_color.c", - "libtiff/tif_compress.c", - "libtiff/tif_dir.c", - "libtiff/tif_dirinfo.c", - "libtiff/tif_dirread.c", - "libtiff/tif_dirwrite.c", - "libtiff/tif_dumpmode.c", - "libtiff/tif_error.c", - "libtiff/tif_extension.c", - "libtiff/tif_fax3.c", - "libtiff/tif_fax3sm.c", - "libtiff/tif_flush.c", - "libtiff/tif_getimage.c", - "libtiff/tif_jpeg.c", - "libtiff/tif_luv.c", - "libtiff/tif_lzw.c", - "libtiff/tif_next.c", - "libtiff/tif_ojpeg.c", - "libtiff/tif_open.c", - "libtiff/tif_packbits.c", - "libtiff/tif_pixarlog.c", - "libtiff/tif_predict.c", - "libtiff/tif_print.c", - "libtiff/tif_read.c", - "libtiff/tif_strip.c", - "libtiff/tif_swab.c", - "libtiff/tif_thunder.c", - "libtiff/tif_tile.c", - "libtiff/tif_version.c", - "libtiff/tif_warning.c", - "libtiff/tif_write.c", - "libtiff/tif_zip.c", - "libtiff/tiffiop.h", - "libtiff/tiffvers.h", - ] + public_configs = [ ":fx_tiff_config" ] } }