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 5d05c0b049251d912853481f3830517c05b418d9
Author: Rene Engelhard <r...@debian.org>
Date: Thu Feb 4 15:04:02 2016 +0100
update GIT_BRANCH...
---
patches/tdf96653.diff | 34 ----------------------------------
rules | 2 +-
2 files changed, 1 insertion(+), 35 deletions(-)
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?= <caol...@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
-
diff --git a/rules b/rules
index 0e94694..95d86a1 100755
--- a/rules
+++ b/rules
@@ -72,7 +72,7 @@ lo_sources_ver=$(shell grep AC_INIT
$(SOURCE_TREE)/configure.ac | grep documentf
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-5-1-0
+GIT_BRANCH=libreoffice-5-1
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
