summaryrefslogtreecommitdiff
path: root/vcl/source/filter/ipdf/pdfread.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-02-20 10:05:57 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-02-20 10:59:15 +0000
commit711bc66ca34d3b1293a01fa7db16522b87055495 (patch)
tree2097473f39f104438fe66a25549dc12eb4179cbf /vcl/source/filter/ipdf/pdfread.cxx
parentf35e6f2504384ad66b475d39849ed10987b2da53 (diff)
vcl PDF filter: avoid copy&paste
By using a single ifdef block for the disable-pdfium case and by adding PDFWriterImpl::BitmapEmit::getObject(). Change-Id: Ia21e16d469bc75e9b1a95342ed01caef3e91ccd9 Reviewed-on: https://gerrit.libreoffice.org/34462 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'vcl/source/filter/ipdf/pdfread.cxx')
-rw-r--r--vcl/source/filter/ipdf/pdfread.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
index d998402877fa..d7de71ea37dc 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -37,12 +37,9 @@ double pointToPixel(double fPoint)
return fPoint / 72 * 96;
}
-#endif
-
/// Does PDF to PNG conversion using pdfium.
bool generatePreview(SvStream& rStream, Graphic& rGraphic)
{
-#if HAVE_FEATURE_PDFIUM
FPDF_LIBRARY_CONFIG aConfig;
aConfig.version = 2;
aConfig.m_pUserFontPaths = nullptr;
@@ -109,13 +106,18 @@ bool generatePreview(SvStream& rStream, Graphic& rGraphic)
FPDF_ClosePage(pPdfPage);
FPDF_CloseDocument(pPdfDocument);
FPDF_DestroyLibrary();
+
+ return true;
+}
#else
+bool generatePreview(SvStream& rStream, Graphic& rGraphic)
+{
(void)rStream;
(void)rGraphic;
-#endif
return true;
}
+#endif // HAVE_FEATURE_PDFIUM
}