summaryrefslogtreecommitdiff
path: root/vcl/win
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2020-01-09 14:10:00 +0100
committerLuboš Luňák <l.lunak@collabora.com>2020-01-09 15:26:31 +0100
commit994b8e52fc02c7468a243efd5e3ba7ffcd81e283 (patch)
tree106db5f9d3a945b5abc6f2d98ee21e83af9e56a2 /vcl/win
parent3aa151e4de4c02b094acb6fa8a919cc86051a6fd (diff)
add setting to config_skia.h whether to use 32bpp bitmaps
As said in previous Skia commits about BackendCapabilities::mbSupportsBitmap32 this should be preferrably enabled, but there are still parts of LO code that have a problem with it, so make it easier to enable/disable this. Change-Id: Iae7a8d5fc77a27372c00f6745317d168e8b2a05b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86489 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl/win')
-rw-r--r--vcl/win/app/salinst.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 4b97215b6dac..26ce820a1b67 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -50,6 +50,7 @@
#include <config_features.h>
#include <vcl/skia/SkiaHelper.hxx>
#if HAVE_FEATURE_SKIA
+#include <config_skia.h>
#include <skia/salbmp.hxx>
#include <skia/win/gdiimpl.hxx>
#endif
@@ -1078,9 +1079,11 @@ std::shared_ptr<vcl::BackendCapabilities> WinSalInstance::GetBackendCapabilities
{
auto pBackendCapabilities = SalInstance::GetBackendCapabilities();
#if HAVE_FEATURE_SKIA
+#if SKIA_USE_BITMAP32
if( SkiaHelper::isVCLSkiaEnabled())
pBackendCapabilities->mbSupportsBitmap32 = true;
#endif
+#endif
return pBackendCapabilities;
}