[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/source

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Thu Apr 4 14:58:51 UTC 2019


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

New commits:
commit cba5d19a4e0c929cafbeccbaaa1da63ee1ec20b5
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Apr 4 17:53:38 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Apr 4 17:54:39 2019 +0300

    Fix compilation in !HAVE_FEATURE_PDFIUM case
    
    Change-Id: Ifc5e82f9bf57c76abe8810911f8f4339f9763453

diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
index 87bfdc60b629..e1d5c5b9b890 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -292,6 +292,7 @@ size_t ImportPDF(const OUString& rURL, std::vector<Bitmap>& rBitmaps,
 size_t ImportPDFUnloaded(const OUString& rURL, std::vector<std::pair<Graphic, Size>>& rGraphics,
                          const double fResolutionDPI)
 {
+#if HAVE_FEATURE_PDFIUM
     std::unique_ptr<SvStream> xStream(
         ::utl::UcbStreamHelper::CreateStream(rURL, StreamMode::READ | StreamMode::SHARE_DENYNONE));
 
@@ -359,6 +360,13 @@ size_t ImportPDFUnloaded(const OUString& rURL, std::vector<std::pair<Graphic, Si
     FPDF_DestroyLibrary();
 
     return rGraphics.size();
+#else
+    (void) rURL;
+    (void) rGraphics;
+    (void) fResolutionDPI;
+
+    return 0;
+#endif
 }
 }
 


More information about the Libreoffice-commits mailing list