From 6d8ce5b1d608d2e8e4dc36dec43328e9380a8bc9 Mon Sep 17 00:00:00 2001 From: Ashod Nakashian Date: Thu, 24 May 2018 23:01:15 -0400 Subject: [PATCH] pdf: preserve the original page dimensions on import Also allow for rendering PDFs to images at custom resolution, instead of hard-coded (old hard-coded value of 96 dpi is now default arguments). Change-Id: Ia5b52f72d6ce7130a2debc7c6f86504aa041bdc8 Reviewed-on: https://gerrit.libreoffice.org/54786 Reviewed-by: Jan Holesovsky Tested-by: Jan Holesovsky --- include/vcl/pdfread.hxx | 10 +++++++--- sd/source/filter/pdf/sdpdffilter.cxx | 13 ++++++++++--- vcl/source/filter/ipdf/pdfread.cxx | 31 ++++++++++++++++++++----------- 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/include/vcl/pdfread.hxx b/include/vcl/pdfread.hxx index 1ffabf5ce0d4..0e1b546daa36 100644 --- a/include/vcl/pdfread.hxx +++ b/include/vcl/pdfread.hxx @@ -34,11 +34,15 @@ namespace vcl VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Bitmap& rBitmap, size_t nPageIndex, css::uno::Sequence& rPdfData, sal_uInt64 nPos = STREAM_SEEK_TO_BEGIN, - sal_uInt64 nSize = STREAM_SEEK_TO_END); -VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic); + sal_uInt64 nSize = STREAM_SEEK_TO_END, + const double fResolutionDPI = 96.); + +VCL_DLLPUBLIC bool ImportPDF(SvStream& rStream, Graphic& rGraphic, + const double fResolutionDPI = 96.); VCL_DLLPUBLIC size_t ImportPDF(const OUString& rURL, std::vector& rBitmaps, - css::uno::Sequence& rPdfData); + css::uno::Sequence& rPdfData, + const double fResolutionDPI = 96.); } #endif // INCLUDED_VCL_SOURCE_FILTER_IPDF_PDFREAD_HXX diff --git a/sd/source/filter/pdf/sdpdffilter.cxx b/sd/source/filter/pdf/sdpdffilter.cxx index a52a6aea3353..ad00ae0ba0ba 100644 --- a/sd/source/filter/pdf/sdpdffilter.cxx +++ b/sd/source/filter/pdf/sdpdffilter.cxx @@ -100,9 +100,12 @@ bool SdPdfFilter::Import() const OUString aFileName( mrMedium.GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::NONE)); + // Rendering resolution. + const double dResolutionDPI = 96.; + uno::Sequence aPdfData; std::vector aBitmaps; - if (vcl::ImportPDF(aFileName, aBitmaps, aPdfData) == 0) + if (vcl::ImportPDF(aFileName, aBitmaps, aPdfData, dResolutionDPI) == 0) return false; // Prepare the link with the PDF stream. @@ -129,8 +132,12 @@ bool SdPdfFilter::Import() // Create the page and insert the Graphic. SdPage* pPage = mrDocument.GetSdPage(nPageNumber++, PageKind::Standard); - const Size aGrfSize(OutputDevice::LogicToLogic( - aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), MapMode(MapUnit::Map100thMM))); + Size aGrfSize(OutputDevice::LogicToLogic(aGraphic.GetPrefSize(), aGraphic.GetPrefMapMode(), + MapMode(MapUnit::Map100thMM))); + + // Resize to original size based on 72 dpi to preserve page size. + aGrfSize = Size(aGrfSize.Width() * 72. / dResolutionDPI, + aGrfSize.Height() * 72. / dResolutionDPI); // Make the page size match the rendered image. pPage->SetSize(aGrfSize); diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx index b5fa067a324a..bd48443df88a 100644 --- a/vcl/source/filter/ipdf/pdfread.cxx +++ b/vcl/source/filter/ipdf/pdfread.cxx @@ -53,11 +53,15 @@ int CompatibleWriter::WriteBlockCallback(FPDF_FILEWRITE* pFileWrite, const void* } /// Convert to inch, then assume 96 DPI. -double pointToPixel(double fPoint) { return fPoint / 72 * 96; } +inline double pointToPixel(const double fPoint, const double fResolutionDPI) +{ + return fPoint * fResolutionDPI / 72.; +} /// Does PDF to bitmap conversion using pdfium. size_t generatePreview(SvStream& rStream, std::vector& rBitmaps, sal_uInt64 nPos, - sal_uInt64 nSize, const size_t nFirstPage, int nPages) + sal_uInt64 nSize, const size_t nFirstPage = 0, int nPages = 1, + const double fResolutionDPI = 96.) { FPDF_LIBRARY_CONFIG aConfig; aConfig.version = 2; @@ -89,8 +93,8 @@ size_t generatePreview(SvStream& rStream, std::vector& rBitmaps, sal_uIn break; // Returned unit is points, convert that to pixel. - const size_t nPageWidth = pointToPixel(FPDF_GetPageWidth(pPdfPage)); - const size_t nPageHeight = pointToPixel(FPDF_GetPageHeight(pPdfPage)); + const size_t nPageWidth = pointToPixel(FPDF_GetPageWidth(pPdfPage), fResolutionDPI); + const size_t nPageHeight = pointToPixel(FPDF_GetPageHeight(pPdfPage), fResolutionDPI); FPDF_BITMAP pPdfBitmap = FPDFBitmap_Create(nPageWidth, nPageHeight, /*alpha=*/1); if (!pPdfBitmap) break; @@ -192,7 +196,8 @@ bool getCompatibleStream(SvStream& rInStream, SvStream& rOutStream, sal_uInt64 n return rOutStream.good(); } #else -size_t generatePreview(SvStream&, std::vector&, sal_uInt64, sal_uInt64, size_t, int) +size_t generatePreview(SvStream&, std::vector&, sal_uInt64, sal_uInt64, size_t, int, + const double) { return 0; } @@ -210,11 +215,13 @@ bool getCompatibleStream(SvStream& rInStream, SvStream& rOutStream, sal_uInt64 n namespace vcl { bool ImportPDF(SvStream& rStream, Bitmap& rBitmap, size_t nPageIndex, - css::uno::Sequence& rPdfData, sal_uInt64 nPos, sal_uInt64 nSize) + css::uno::Sequence& rPdfData, sal_uInt64 nPos, sal_uInt64 nSize, + const double fResolutionDPI) { // Get the preview of the first page. std::vector aBitmaps; - if (generatePreview(rStream, aBitmaps, nPos, nSize, nPageIndex, 1) != 1 || aBitmaps.empty()) + if (generatePreview(rStream, aBitmaps, nPos, nSize, nPageIndex, 1, fResolutionDPI) != 1 + || aBitmaps.empty()) return false; rBitmap = aBitmaps[0]; @@ -232,11 +239,11 @@ bool ImportPDF(SvStream& rStream, Bitmap& rBitmap, size_t nPageIndex, return true; } -bool ImportPDF(SvStream& rStream, Graphic& rGraphic) +bool ImportPDF(SvStream& rStream, Graphic& rGraphic, const double fResolutionDPI) { uno::Sequence aPdfData; Bitmap aBitmap; - const bool bRet = ImportPDF(rStream, aBitmap, 0, aPdfData); + const bool bRet = ImportPDF(rStream, aBitmap, 0, aPdfData, fResolutionDPI); rGraphic = aBitmap; rGraphic.setPdfData(std::make_shared>(aPdfData)); rGraphic.setPageNumber(0); // We currently import only the first page. @@ -244,12 +251,14 @@ bool ImportPDF(SvStream& rStream, Graphic& rGraphic) } size_t ImportPDF(const OUString& rURL, std::vector& rBitmaps, - css::uno::Sequence& rPdfData) + css::uno::Sequence& rPdfData, const double fResolutionDPI) { std::unique_ptr xStream( ::utl::UcbStreamHelper::CreateStream(rURL, StreamMode::READ | StreamMode::SHARE_DENYNONE)); - if (generatePreview(*xStream, rBitmaps, STREAM_SEEK_TO_BEGIN, STREAM_SEEK_TO_END, 0, -1) == 0) + if (generatePreview(*xStream, rBitmaps, STREAM_SEEK_TO_BEGIN, STREAM_SEEK_TO_END, 0, -1, + fResolutionDPI) + == 0) return 0; // Save the original PDF stream for later use. -- 2.11.4.GIT