From 60e0c6fd03ac26df00877efea65537828e43583c Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Sep 2020 17:17:48 +0200 Subject: xmlsecurity: pdf incremental updates that are non-commenting are invalid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- external/pdfium/build.patch.1 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'external/pdfium') 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(y * 255.f + rounding_offset); + uint8_t k1 = static_cast(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; -- cgit v1.2.3