summaryrefslogtreecommitdiff
path: root/vcl/unx/generic
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-10-01 11:51:59 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-10-02 08:01:09 +0200
commit5da08d7b14b03459070228bad1b42dc5d1746b9f (patch)
treed871d3ded7db85b03b280228a6fb23f503895ead /vcl/unx/generic
parent67fd62b3edc86c2891f279b25cf9919c4bbbbca1 (diff)
tdf#127858 Assertion when trying to edit a form (gen backend)
regression from commit 78b9dac2ee77bf6efc1298962cbeca284db5b00a remove internal use of 16-bit packed formats we are trying to create a 32-bit image in drawinglayer::primitive2d::createDefaultCross_3x3 Change-Id: Iaf19326b1e2c11c5d535dd8f317086bebbaaebec Reviewed-on: https://gerrit.libreoffice.org/79948 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r--vcl/unx/generic/gdi/salbmp.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 0a96048ae21f..a81eb608ec21 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -149,7 +149,7 @@ std::unique_ptr<BitmapBuffer> X11SalBitmap::ImplCreateDIB(
case 8: pDIB->mnFormat |= ScanlineFormat::N8BitPal; break;
case 24: pDIB->mnFormat |= ScanlineFormat::N24BitTcBgr; break;
default:
- assert(false);
+ SAL_WARN("vcl.gdi", "32-bit images not supported, converting to 24-bit");
nBitCount = 24;
pDIB->mnFormat |= ScanlineFormat::N24BitTcBgr;
break;