[libreoffice] 02/02: git update; tdf96653.diff is upstream
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 406b318aade998f318a0398c14dd01e7ec65a625
Author: Rene Engelhard <rene@debian.org>
Date: Thu Feb 4 15:04:39 2016 +0100
git update; tdf96653.diff is upstream
---
changelog | 5 ++---
patches/series | 1 -
patches/tdf96653.diff | 34 ----------------------------------
3 files changed, 2 insertions(+), 38 deletions(-)
diff --git a/changelog b/changelog
index 74032d0..e3bf210 100644
--- a/changelog
+++ b/changelog
@@ -1,12 +1,11 @@
-libreoffice (1:5.1.1~rc1~git20160203-1) UNRELEASED; urgency=medium
+libreoffice (1:5.1.1~rc1~git20160204-1) UNRELEASED; urgency=medium
* New upstream snapshot
- fixes scrolling direction with trackpad in gtk3 (closes: #809363)
+ - fixes distorted images in PDF export (closes: #813586)
* debian/patches/bash-completion-dir.diff: add from master;
install bash completion to "new" /usr/share/bash-completion/completions
- * debian/patches/tdf96653.diff: backport tdf#96653 fix from master
- (fix (PNG) images in PDF export), closes: #813586
* debian/libreoffice-common.maintscript:
rm_conffile /etc/bash_completion.d/libreoffice.sh
diff --git a/patches/series b/patches/series
index 2fbd1c4..fed3759 100644
--- a/patches/series
+++ b/patches/series
@@ -32,4 +32,3 @@ disable-npapi-plugin-support.diff
gcc-6.diff
GCC-6-PR69273-workaround.diff
bash-completion-dir.diff
-tdf96653.diff
diff --git a/patches/tdf96653.diff b/patches/tdf96653.diff
deleted file mode 100644
index 51a0712..0000000
--- a/patches/tdf96653.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-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: