diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-09-04 17:17:48 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-10 20:54:16 +0200 |
| commit | 60e0c6fd03ac26df00877efea65537828e43583c (patch) | |
| tree | 770fdbb3f78f000af66c640c4b43d7fe1d160acd /external | |
| parent | external: update pdfium from 3963 to 4137 (diff) | |
| download | core-60e0c6fd03ac26df00877efea65537828e43583c.tar.gz core-60e0c6fd03ac26df00877efea65537828e43583c.zip | |
xmlsecurity: pdf incremental updates that are non-commenting are invalid
I.e. it's OK to add incremental updates for annotation/commenting
purposes and that doesn't invalite existing signatures. Everything else
does.
(cherry picked from commit 61834cd574568613f0b0a2ee099a60fa5a8d9804)
[ Also disable a pdfium assert on Windows, only on this branch, where it
fails during CppunitTest_xmlsecurity_pdfsigning for reasons unclear to
me. ]
Conflicts:
include/vcl/filter/PDFiumLibrary.hxx
vcl/source/pdf/PDFiumLibrary.cxx
Change-Id: I4607c242b3c6f6b01517b02407e9e7a095e2e069
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102325
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/pdfium/build.patch.1 | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1 index 16544f0c7c81..b19fa1174419 100644 --- a/external/pdfium/build.patch.1 +++ b/external/pdfium/build.patch.1 @@ -37,3 +37,18 @@ index 0fb627ba8..dda1fc8bc 100644 : span(container.data(), container.size()) {} template < typename Container, +--- a/core/fxge/dib/cfx_cmyk_to_srgb.cpp 2020-09-10 17:32:37.165872018 +0200 ++++ b/core/fxge/dib/cfx_cmyk_to_srgb.cpp 2020-09-10 17:33:15.870395738 +0200 +@@ -1740,10 +1740,12 @@ + uint8_t y1 = static_cast<int>(y * 255.f + rounding_offset); + uint8_t k1 = static_cast<int>(k * 255.f + rounding_offset); + ++#ifndef _WIN32 + ASSERT(c1 == FXSYS_roundf(c * 255)); + ASSERT(m1 == FXSYS_roundf(m * 255)); + ASSERT(y1 == FXSYS_roundf(y * 255)); + ASSERT(k1 == FXSYS_roundf(k * 255)); ++#endif + + uint8_t r; + uint8_t g; |