diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2023-05-15 09:11:56 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2023-05-15 09:44:30 +0000 |
| commit | ff7e8305b9839683589048493fb9a9f881bced5c (patch) | |
| tree | 1c201bcab8207f6194857a5fac0510b29e833820 | |
| parent | 1d0e73815dbc1be4df5e329ed5e3827b42e0f584 (diff) | |
| download | qtwebengine-chromium-ff7e8305b9839683589048493fb9a9f881bced5c.tar.gz | |
FIXUP: Add pdfium_use_system_libtiff build option
Add missing extern "C" to msvc linkage.
Add public header to source set.
This commit amends 95e07600c1df512543c82e6e6070e6c1447df91e
Task-number: QTBUG-111626
Change-Id: I8b5c05f753d20a9b1643691551eeeb7a87e2544f
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/477700
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | chromium/third_party/pdfium/core/fxcodec/tiff/tiff_decoder.cpp | 2 | ||||
| -rw-r--r-- | chromium/third_party/pdfium/third_party/BUILD.gn | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/chromium/third_party/pdfium/core/fxcodec/tiff/tiff_decoder.cpp b/chromium/third_party/pdfium/core/fxcodec/tiff/tiff_decoder.cpp index 808a4c71cc0..d0e7faabe93 100644 --- a/chromium/third_party/pdfium/core/fxcodec/tiff/tiff_decoder.cpp +++ b/chromium/third_party/pdfium/core/fxcodec/tiff/tiff_decoder.cpp @@ -110,8 +110,10 @@ int _TIFFmemcmp(const void* ptr1, const void* ptr2, tmsize_t size) { return memcmp(ptr1, ptr2, static_cast<size_t>(size)); } +extern "C" { TIFFErrorHandler _TIFFwarningHandler = nullptr; TIFFErrorHandler _TIFFerrorHandler = nullptr; +} namespace { diff --git a/chromium/third_party/pdfium/third_party/BUILD.gn b/chromium/third_party/pdfium/third_party/BUILD.gn index 5695e271214..5452110679d 100644 --- a/chromium/third_party/pdfium/third_party/BUILD.gn +++ b/chromium/third_party/pdfium/third_party/BUILD.gn @@ -575,6 +575,7 @@ if (pdf_enable_xfa_tiff) { "libtiff/tif_version.c", "libtiff/tif_warning.c", "libtiff/tif_write.c", + "libtiff/tiffio.h", "libtiff/tiffiop.h", "libtiff/tiffvers.h", ] |