diff options
author | Noel Grandin <noelgrandin@gmail.com> | 2020-09-19 20:38:29 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-09-19 22:20:57 +0200 |
commit | 5f3f17a9c64e33fb787a79dc94d902147da77d71 (patch) | |
tree | 8c0228c8a3e2f00ead11ca7b0649ac4c77f9202e | |
parent | 6a59a8397ccef5dce5efe5022d84e7b89fd68375 (diff) |
fix non-pdfium build
Change-Id: Ic1e30a412927748ba58a21cf2ee922cd1a490aa4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103040
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r-- | vcl/source/filter/ipdf/pdfread.cxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/pdfio/pdfdocument.cxx | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx index 39c2933be8d5..a9b079a75bc3 100644 --- a/vcl/source/filter/ipdf/pdfread.cxx +++ b/vcl/source/filter/ipdf/pdfread.cxx @@ -220,7 +220,7 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, std::vector<Bitmap>& rBi (void)rBitmaps; (void)nFirstPage; (void)nPages; - (void)fResolutionDPI; + (void)pSizeHint; return 0; #endif // HAVE_FEATURE_PDFIUM } diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx b/xmlsecurity/source/pdfio/pdfdocument.cxx index 8561c481170b..b2c1cc0db77a 100644 --- a/xmlsecurity/source/pdfio/pdfdocument.cxx +++ b/xmlsecurity/source/pdfio/pdfdocument.cxx @@ -137,10 +137,10 @@ bool IsCompleteSignature(SvStream& rStream, vcl::filter::PDFDocument& rDocument, return std::find(rAllEOFs.begin(), rAllEOFs.end(), nFileEnd) != rAllEOFs.end(); } +#if HAVE_FEATURE_PDFIUM /// Collects the checksum of each page of one version of the PDF. void AnalyizeSignatureStream(SvMemoryStream& rStream, std::vector<BitmapChecksum>& rPageChecksums) { -#if HAVE_FEATURE_PDFIUM auto pPdfium = vcl::pdf::PDFiumLibrary::get(); vcl::pdf::PDFiumDocument aPdfDocument( FPDF_LoadMemDocument(rStream.GetData(), rStream.GetSize(), /*password=*/nullptr)); @@ -157,11 +157,8 @@ void AnalyizeSignatureStream(SvMemoryStream& rStream, std::vector<BitmapChecksum BitmapChecksum nPageChecksum = pPdfPage->getChecksum(); rPageChecksums.push_back(nPageChecksum); } -#else - (void)rStream; - (void)rPageChecksums; -#endif } +#endif /** * Checks if incremental updates after singing performed valid modifications only. @@ -175,6 +172,7 @@ bool IsValidSignature(SvStream& rStream, vcl::filter::PDFObjectElement* pSignatu return false; } +#if HAVE_FEATURE_PDFIUM SvMemoryStream aSignatureStream; sal_uInt64 nPos = rStream.Tell(); rStream.Seek(0); @@ -196,6 +194,10 @@ bool IsValidSignature(SvStream& rStream, vcl::filter::PDFObjectElement* pSignatu // Fail if any page looks different after signing and at the end. Annotations/commenting doesn't // count, though. return aSignedPages == aAllPages; +#else + (void)rStream; + return true; +#endif } } |