diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2015-12-04 18:19:08 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-12-13 17:33:31 +0100 |
| commit | 3ce8662ea666b8d97286daee0fec514aa981856f (patch) | |
| tree | 6af94c50ad4cf180169fc9e8aa37b07e694b544e | |
| parent | fix a set of race conditions in the writer uno wrappers (diff) | |
| download | core-3ce8662ea666b8d97286daee0fec514aa981856f.tar.gz core-3ce8662ea666b8d97286daee0fec514aa981856f.zip | |
tdf#94739 use GetScanlineSize instead of calculating it
We calculate the scanline size wrongly when writing a PDF so the
image is not exported correctly. BitmapAccess already has a method
to determine the scanline size so use that instead.
Change-Id: Icccba8f26c5e0fd4bd4c37bba7c5a7fe8d0094bd
(cherry picked from commit 82e0c38e1205a3c8a70234a95ca33ab1400fbe57)
Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/20595
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit ffe150ce903d9cdc62c25ad3437e61d24ede17d6)
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 0b7fa46b446c..e509b1a7766d 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -11426,7 +11426,7 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask ) beginCompression(); if( ! bTrueColor || pAccess->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_RGB ) { - const int nScanLineBytes = 1 + ( pAccess->GetBitCount() * ( pAccess->Width() - 1 ) / 8U ); + const int nScanLineBytes = pAccess->GetScanlineSize(); for( int i = 0; i < pAccess->Height(); i++ ) { |