[Libreoffice-commits] core.git: vcl/source

[Stephan Bergmann (via logerrit)]

 vcl/source/filter/ipdf/pdfread.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 49da32af187f28166fd62205d797bf9aa9ec2ace
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Sep 7 10:52:53 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Sep 7 12:19:34 2020 +0200

    Confine findAnnotations to HAVE_FEATURE_PDFIUM
    
    Otherwise e.g. Android builds would fail with
    
    > vcl/source/filter/ipdf/pdfread.cxx:231:77: error: no member named 'PDFiumPage' in namespace 'vcl::pdf'
    > std::vector<PDFGraphicAnnotation> findAnnotations(std::unique_ptr<vcl::pdf::PDFiumPage>& pPage,
    >                                                                   ~~~~~~~~~~^
    
    etc.
    
    Regression apparently introduced with 6d275917944c274a22620c2c19880eb8e94f2558
    "extract PDF import for annotations to a separate function".
    
    Change-Id: I364d8d3f30c7eeaa933bfe6aebaf4cad35c20d2b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102153
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
index 1dde06491ea1..d89283e902ac 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -226,6 +226,7 @@ bool ImportPDF(SvStream& rStream, Graphic& rGraphic)
     return true;
 }
 
+#if HAVE_FEATURE_PDFIUM
 namespace
 {
 std::vector<PDFGraphicAnnotation> findAnnotations(std::unique_ptr<vcl::pdf::PDFiumPage>& pPage,
@@ -275,6 +276,7 @@ std::vector<PDFGraphicAnnotation> findAnnotations(std::unique_ptr<vcl::pdf::PDFi
 }
 
 } // end anonymous namespace
+#endif
 
 size_t ImportPDFUnloaded(const OUString& rURL, std::vector<PDFGraphicResult>& rGraphics)
 {