[libreoffice] 02/03: backport PDF export fix
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit d7567b858fef4b3f4821803238784478ac5fdb17
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 3 17:31:46 2016 +0100
backport PDF export fix
---
changelog | 3 +++
patches/series | 1 +
patches/tdf96653.diff | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 38 insertions(+)
diff --git a/changelog b/changelog
index 8fb3865..35d3193 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,9 @@ libreoffice (1:5.1.1~rc1~git20160203-1) UNRELEASED; urgency=medium
* New upstream snapshot
- fixes scrolling direction with trackpad in gtk3 (closes: #809363)
+ * debian/patches/tdf96653.diff: backport tdf#96653 fix from master
+ (fix (PNG) images in PDF export), closes: #813586
+
* debian/scripts/gid2pkgdirs.sh,
debian/libreoffice-common.{post,pre}{rm,inst}.in:
install bash completion to "new" /usr/share/bash-completion/completions,
diff --git a/patches/series b/patches/series
index fcbe8ce..2e5ab19 100644
--- a/patches/series
+++ b/patches/series
@@ -31,3 +31,4 @@ debian-branding.diff
disable-npapi-plugin-support.diff
gcc-6.diff
GCC-6-PR69273-workaround.diff
+tdf96653.diff
diff --git a/patches/tdf96653.diff b/patches/tdf96653.diff
new file mode 100644
index 0000000..51a0712
--- /dev/null
+++ b/patches/tdf96653.diff
@@ -0,0 +1,34 @@
+From 384c815eda697d75706f686dc2ceb227b4d3f245 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Wed, 3 Feb 2016 12:36:09 +0000
+Subject: Resolves: tdf#96653 distorted images on export to pdf
+
+regression from:
+
+commit ffe150ce903d9cdc62c25ad3437e61d24ede17d6
+Date: Fri Dec 4 18:19:08 2015 +0100
+
+ tdf#94739 use GetScanlineSize instead of calculating it
+
+which was on the right track in the sense that the original
+code was wrong and only worked for <= 8 bit depth images
+
+Change-Id: Iee54a9f29dd0fdaf3e1f2aeb7b9898cecb453e37
+
+diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
+index de67de6..3c20b49 100644
+--- a/vcl/source/gdi/pdfwriter_impl.cxx
++++ b/vcl/source/gdi/pdfwriter_impl.cxx
+@@ -11390,7 +11390,8 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
+ beginCompression();
+ if( ! bTrueColor || pAccess->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_RGB )
+ {
+- const int nScanLineBytes = pAccess->GetScanlineSize();
++ //With PDF bitmaps, each row is padded to a BYTE boundary (multiple of 8 bits).
++ const int nScanLineBytes = ((pAccess->GetBitCount() * pAccess->Width()) + 7U) / 8U;
+
+ for( long i = 0; i < pAccess->Height(); i++ )
+ {
+--
+cgit v0.10.2
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: