include/vcl/pdfextoutdevdata.hxx | 2 vcl/Module_vcl.mk | 6 +- vcl/qa/cppunit/pdfexport/data/tdf106702.odt |binary vcl/qa/cppunit/pdfexport/pdfexport.cxx | 81 ++++++++++++++++++++++------ vcl/source/gdi/pdfextoutdevdata.cxx | 25 +++++++- vcl/source/gdi/pdfwriter_impl2.cxx | 2 6 files changed, 94 insertions(+), 22 deletions(-)
New commits: commit 4c2172a3e973bc6351107a3a1b554c77b40b75dd Author: Miklos Vajna <[email protected]> Date: Tue May 22 16:20:18 2018 +0200 tdf#106702 PDF export: fix missing images from Writer headers/footers Position of an image is determined by the relevant bitmap scale metafile action when recompressing images. The same position was determined by PDFExtOutDevData "meta" info when not recompressing images. This second rectangle was never correct for images repeated in Writer headers/footers on non-first pages: the position was relative to the page, while PDF export sets the map mode (origin) of the output device during export, so such positions are expected to be absolute ones. The root of the problem seems to be that header images in Writer are both repeated (as the user sees it) and unrepeated (as the doc model sees it), and by the time we want to get its position, we only see the unrepeated SdrObject. Fix the problem by using the correct position from the scale action and not from PDFExtOutDevData if possible. (Also give up on running CppunitTest_vcl_pdfexport in the non-pdfium case, most of the tests there do require pdfium anyway, and the growing ifdef forest in that file just made it hard to read the code.) Change-Id: I31c14d4bd223b2804859982542ebd6d5f9abd312 Reviewed-on: https://gerrit.libreoffice.org/54674 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins <[email protected]> diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx index c260f8461fa7..03fa22b77c4d 100644 --- a/include/vcl/pdfextoutdevdata.hxx +++ b/include/vcl/pdfextoutdevdata.hxx @@ -99,7 +99,7 @@ public: PDFExtOutDevData( const OutputDevice& rOutDev ); virtual ~PDFExtOutDevData() override; - bool PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction ); + bool PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction, const GDIMetaFile& rMtf ); void ResetSyncData(); void PlayGlobalActions( PDFWriter& rWriter ); diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index a3db18b5413d..a739d5988716 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -200,12 +200,16 @@ $(eval $(call gb_Module_add_check_targets,vcl,\ CppunitTest_vcl_app_test \ CppunitTest_vcl_jpeg_read_write_test \ CppunitTest_vcl_svm_test \ - CppunitTest_vcl_pdfexport \ CppunitTest_vcl_errorhandler \ CppunitTest_vcl_bitmap_render_test \ CppunitTest_vcl_apitests \ )) +ifneq (,$(filter PDFIUM,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_check_targets,vcl,\ + CppunitTest_vcl_pdfexport \ +)) +endif ifeq ($(USING_X11),TRUE) $(eval $(call gb_Module_add_check_targets,vcl,\ diff --git a/vcl/qa/cppunit/pdfexport/data/tdf106702.odt b/vcl/qa/cppunit/pdfexport/data/tdf106702.odt new file mode 100644 index 000000000000..da3b7e81456e Binary files /dev/null and b/vcl/qa/cppunit/pdfexport/data/tdf106702.odt differ diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index 585b968d76d2..28803f0fd1b2 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -23,11 +23,9 @@ #include <unotools/tempfile.hxx> #include <vcl/filter/pdfdocument.hxx> #include <tools/zcodec.hxx> -#if HAVE_FEATURE_PDFIUM #include <fpdf_edit.h> #include <fpdf_text.h> #include <fpdfview.h> -#endif using namespace ::com::sun::star; @@ -39,15 +37,12 @@ class PdfExportTest : public test::BootstrapFixture, public unotest::MacrosTest { uno::Reference<uno::XComponentContext> mxComponentContext; uno::Reference<lang::XComponent> mxComponent; -#if HAVE_FEATURE_PDFIUM FPDF_PAGE mpPdfPage = nullptr; FPDF_DOCUMENT mpPdfDocument = nullptr; -#endif public: virtual void setUp() override; virtual void tearDown() override; -#if HAVE_FEATURE_PDFIUM void load(const OUString& rFile, vcl::filter::PDFDocument& rDocument); /// Tests that a pdf image is roundtripped back to PDF as a vector format. void testTdf106059(); @@ -86,10 +81,9 @@ public: #endif void testTdf109143(); void testTdf105954(); -#endif + void testTdf106702(); CPPUNIT_TEST_SUITE(PdfExportTest); -#if HAVE_FEATURE_PDFIUM CPPUNIT_TEST(testTdf106059); CPPUNIT_TEST(testTdf105461); CPPUNIT_TEST(testTdf107868); @@ -115,7 +109,7 @@ public: #endif CPPUNIT_TEST(testTdf109143); CPPUNIT_TEST(testTdf105954); -#endif + CPPUNIT_TEST(testTdf106702); CPPUNIT_TEST_SUITE_END(); }; @@ -126,23 +120,19 @@ void PdfExportTest::setUp() mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory())); mxDesktop.set(frame::Desktop::create(mxComponentContext)); -#if HAVE_FEATURE_PDFIUM FPDF_LIBRARY_CONFIG config; config.version = 2; config.m_pUserFontPaths = nullptr; config.m_pIsolate = nullptr; config.m_v8EmbedderSlot = 0; FPDF_InitLibraryWithConfig(&config); -#endif } void PdfExportTest::tearDown() { -#if HAVE_FEATURE_PDFIUM FPDF_ClosePage(mpPdfPage); FPDF_CloseDocument(mpPdfDocument); FPDF_DestroyLibrary(); -#endif if (mxComponent.is()) mxComponent->dispose(); @@ -150,8 +140,6 @@ void PdfExportTest::tearDown() test::BootstrapFixture::tearDown(); } -#if HAVE_FEATURE_PDFIUM - char const DATA_DIRECTORY[] = "/vcl/qa/cppunit/pdfexport/data/"; void PdfExportTest::load(const OUString& rFile, vcl::filter::PDFDocument& rDocument) @@ -1343,7 +1331,70 @@ void PdfExportTest::testTdf105954() CPPUNIT_ASSERT_LESS(static_cast<unsigned int>(250), aMeta.width); } -#endif +void PdfExportTest::testTdf106702() +{ + // Import the bugdoc and export as PDF. + OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) + "tdf106702.odt"; + mxComponent = loadFromDesktop(aURL); + CPPUNIT_ASSERT(mxComponent.is()); + + uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); + utl::TempFile aTempFile; + aTempFile.EnableKillingFile(); + utl::MediaDescriptor aMediaDescriptor; + aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export"); + xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); + + // Parse the export result with pdfium. + SvFileStream aFile(aTempFile.GetURL(), StreamMode::READ); + SvMemoryStream aMemory; + aMemory.WriteStream(aFile); + mpPdfDocument + = FPDF_LoadMemDocument(aMemory.GetData(), aMemory.GetSize(), /*password=*/nullptr); + CPPUNIT_ASSERT(mpPdfDocument); + + // The document has two pages. + CPPUNIT_ASSERT_EQUAL(2, FPDF_GetPageCount(mpPdfDocument)); + + // First page already has the correct image position. + mpPdfPage = FPDF_LoadPage(mpPdfDocument, /*page_index=*/0); + CPPUNIT_ASSERT(mpPdfPage); + int nExpected = 0; + int nPageObjectCount = FPDFPage_CountObjects(mpPdfPage); + for (int i = 0; i < nPageObjectCount; ++i) + { + FPDF_PAGEOBJECT pPageObject = FPDFPage_GetObject(mpPdfPage, i); + if (FPDFPageObj_GetType(pPageObject) != FPDF_PAGEOBJ_IMAGE) + continue; + + float fLeft = 0, fBottom = 0, fRight = 0, fTop = 0; + FPDFPageObj_GetBounds(pPageObject, &fLeft, &fBottom, &fRight, &fTop); + nExpected = fTop; + break; + } + + // Second page had an incorrect image position. + FPDF_ClosePage(mpPdfPage); + mpPdfPage = FPDF_LoadPage(mpPdfDocument, /*page_index=*/1); + CPPUNIT_ASSERT(mpPdfPage); + int nActual = 0; + nPageObjectCount = FPDFPage_CountObjects(mpPdfPage); + for (int i = 0; i < nPageObjectCount; ++i) + { + FPDF_PAGEOBJECT pPageObject = FPDFPage_GetObject(mpPdfPage, i); + if (FPDFPageObj_GetType(pPageObject) != FPDF_PAGEOBJ_IMAGE) + continue; + + float fLeft = 0, fBottom = 0, fRight = 0, fTop = 0; + FPDFPageObj_GetBounds(pPageObject, &fLeft, &fBottom, &fRight, &fTop); + nActual = fTop; + break; + } + + // This failed, vertical pos is 818 points, was 1674 (outside visible page + // bounds). + CPPUNIT_ASSERT_EQUAL(nExpected, nActual); +} CPPUNIT_TEST_SUITE_REGISTRATION(PdfExportTest); diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index a36a056ddfd2..05bb37a0c6c3 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -22,6 +22,7 @@ #include <vcl/outdev.hxx> #include <vcl/gfxlink.hxx> #include <vcl/dllapi.h> +#include <vcl/metaact.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> @@ -300,7 +301,7 @@ struct PageSyncData { mpGlobalData = pGlobal; } void PushAction( const OutputDevice& rOutDev, const PDFExtOutDevDataSync::Action eAct ); - bool PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction, const PDFExtOutDevData& rOutDevData ); + bool PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction, const GDIMetaFile& rMtf, const PDFExtOutDevData& rOutDevData ); }; void PageSyncData::PushAction( const OutputDevice& rOutDev, const PDFExtOutDevDataSync::Action eAct ) @@ -316,7 +317,7 @@ void PageSyncData::PushAction( const OutputDevice& rOutDev, const PDFExtOutDevDa aSync.nIdx = 0x7fffffff; // sync not possible mActions.push_back( aSync ); } -bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction, const PDFExtOutDevData& rOutDevData ) +bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAction, const GDIMetaFile& rMtf, const PDFExtOutDevData& rOutDevData ) { bool bRet = false; if ( mActions.size() && ( mActions.front().nIdx == rCurGDIMtfAction ) ) @@ -462,6 +463,22 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc if( pData && nBytes ) { aTmp.WriteBytes( pData, nBytes ); + + // Look up the output rectangle from the previous + // bitmap scale action if possible. This has the + // correct position for images repeated in + // Writer headers/footers for non-first pages. + if (rCurGDIMtfAction > 0) + { + const MetaAction* pAction = rMtf.GetAction(rCurGDIMtfAction - 1); + if (pAction && pAction->GetType() == MetaActionType::BMPSCALE) + { + const MetaBmpScaleAction* pA + = static_cast<const MetaBmpScaleAction*>(pAction); + aOutputRect.SetPos(pA->GetPoint()); + } + } + rWriter.DrawJPGBitmap( aTmp, aGraphic.GetBitmap().GetBitCount() > 8, aGraphic.GetSizePixel(), aOutputRect, aMask, aGraphic ); } @@ -582,9 +599,9 @@ void PDFExtOutDevData::ResetSyncData() { *mpPageSyncData = PageSyncData( mpGlobalSyncData.get() ); } -bool PDFExtOutDevData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rIdx ) +bool PDFExtOutDevData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rIdx, const GDIMetaFile& rMtf ) { - return mpPageSyncData->PlaySyncPageAct( rWriter, rIdx, *this ); + return mpPageSyncData->PlaySyncPageAct( rWriter, rIdx, rMtf, *this ); } void PDFExtOutDevData::PlayGlobalActions( PDFWriter& rWriter ) { diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 9028bc75fa77..e2d4c4178f43 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -269,7 +269,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa for( sal_uInt32 i = 0, nCount = aMtf.GetActionSize(); i < nCount; ) { - if ( !i_pOutDevData || !i_pOutDevData->PlaySyncPageAct( m_rOuterFace, i ) ) + if ( !i_pOutDevData || !i_pOutDevData->PlaySyncPageAct( m_rOuterFace, i, aMtf ) ) { const MetaAction* pAction = aMtf.GetAction( i ); const MetaActionType nType = pAction->GetType(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
