vcl/qa/cppunit/pdfexport/pdfexport2.cxx | 6 +++++-
vcl/source/gdi/pdfwriter_impl.cxx | 14 ++++++++++----
2 files changed, 15 insertions(+), 5 deletions(-)
New commits:
commit ca574d5eef68af970cb49f90c7fc4fe813c9009c
Author: Patrick Luby <guibmac...@gmail.com>
AuthorDate: Mon Apr 22 19:36:14 2024 -0400
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Fri Apr 26 05:35:48 2024 +0200
tdf#160714 use crop box for bounds of embedded PDF object
If there is no crop box, fallback to the media box just to be safe.
Change-Id: I29f99a43e550cf09a1534c0aa01ffd6a55536fb7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166544
Tested-by: Jenkins
Reviewed-by: Patrick Luby <guibomac...@gmail.com>
(cherry picked from commit 4b31f87e918c38a7eb30ceb85563a5c98b426da5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166670
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
index 38e3629497fa..a464798076ed 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
@@ -40,6 +40,7 @@
#include <o3tl/string_view.hxx>
#include <vcl/filter/PDFiumLibrary.hxx>
+#include <vcl/pdfread.hxx>
#include <comphelper/propertyvalue.hxx>
#include <cmath>
@@ -4580,7 +4581,10 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2,
testRexportMediaBoxOrigin)
= { // Rotation by $ heta$ $cos( heta), sin( heta), -sin(
heta), cos( heta)$
0, -1, 1, 0,
// Translate x,y
- -aOrigin[1] - aSize[1] / 2 + aSize[0] / 2, aOrigin[0] + aSize[0] /
2 + aSize[1] / 2
+ -aOrigin[1] - aSize[1] / vcl::PDF_INSERT_MAGIC_SCALE_FACTOR / 2
+ + aSize[0] / vcl::PDF_INSERT_MAGIC_SCALE_FACTOR / 2,
+ aOrigin[0] + aSize[0] / vcl::PDF_INSERT_MAGIC_SCALE_FACTOR / 2
+ + aSize[1] / vcl::PDF_INSERT_MAGIC_SCALE_FACTOR / 2
};
for (sal_Int32 nIdx = 0; nIdx < 6; ++nIdx)
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index fba7a85db430..ff7383d7be99 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -9125,9 +9125,15 @@ void PDFWriterImpl::writeReferenceXObject(const
ReferenceXObjectEmit& rEmit)
}
double aOrigin[2] = { 0.0, 0.0 };
- if (auto* pArray =
dynamic_cast<filter::PDFArrayElement*>(pPage->Lookup("MediaBox"_ostr)))
+
+ // tdf#160714 use crop box for bounds of embedded PDF object
+ // If there is no crop box, fallback to the media box just to be safe.
+ auto* pBoundsArray =
dynamic_cast<filter::PDFArrayElement*>(pPage->Lookup("CropBox"_ostr));
+ if (!pBoundsArray)
+ pBoundsArray =
dynamic_cast<filter::PDFArrayElement*>(pPage->Lookup("MediaBox"_ostr));
+ if (pBoundsArray)
{
- const auto& rElements = pArray->GetElements();
+ const auto& rElements = pBoundsArray->GetElements();
if (rElements.size() >= 4)
{
// get x1, y1 of the rectangle.
@@ -9240,9 +9246,9 @@ void PDFWriterImpl::writeReferenceXObject(const
ReferenceXObjectEmit& rEmit)
// Now transform the object: rotate around the center and make
sure that the rotation
// doesn't affect the aspect ratio.
basegfx::B2DHomMatrix aMat;
- aMat.translate(-0.5 * aBBox.getWidth() - aOrigin[0], -0.5 *
aBBox.getHeight() - aOrigin[1]);
+ aMat.translate((-0.5 * aBBox.getWidth() / fMagicScaleFactor) -
aOrigin[0], (-0.5 * aBBox.getHeight() / fMagicScaleFactor) - aOrigin[1]);
aMat.rotate(basegfx::deg2rad(nAngle));
- aMat.translate(0.5 * nWidth, 0.5 * nHeight);
+ aMat.translate(0.5 * nWidth / fMagicScaleFactor, 0.5 * nHeight /
fMagicScaleFactor);
aLine.append(" /Matrix [ ");
aLine.append(aMat.a());
