diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-10 10:49:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-10 15:12:10 +0200 |
| commit | b9b492e86349507d6c617430435df1c58a0b4994 (patch) | |
| tree | c433aac7ee29af521394724bfdb53258cfab0a4e /vcl | |
| parent | c8c12a75d5a5cd4b191702cb12dd792c76b8f68c (diff) | |
crashtesting assert on export to ods from novell835001-2.xlsx
this is a problem since
commit bea1dc5f8d17c1011cdfab1ff540f3e4b3a4d1bb
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Jul 7 13:59:27 2017 +0100
Resolves: rhbz#1467512 mask not created as 1 bit depth
Change-Id: I3c9fd81bf7413f5decf2b55a660f028c0613c3b3
Reviewed-on: https://gerrit.libreoffice.org/39745
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/outdev/bitmap.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index 4ae3c84d37ce..122ddde80a99 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -1465,8 +1465,8 @@ Bitmap OutputDevice::BlendBitmapWithAlpha( const long nMapX = pMapX[ nX ]; aDstCol = AlphaBlend( nX, nY, nMapX, nMapY, pP, pA, pB.get(), pAlphaW.get(), nResAlpha ); - pB->SetPixel( nY, nX, aDstCol ); - pAlphaW->SetPixel( nY, nX, Color(255L-nResAlpha, 255L-nResAlpha, 255L-nResAlpha) ); + pB->SetPixel(nY, nX, pB->GetBestMatchingColor(aDstCol)); + pAlphaW->SetPixel(nY, nX, pB->GetBestMatchingColor(Color(255L-nResAlpha, 255L-nResAlpha, 255L-nResAlpha))); } } } |