summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2019-10-03 16:00:13 +0200
committerLuboš Luňák <l.lunak@collabora.com>2019-10-04 01:26:04 +0200
commit50bdecc398b496fda948568bb97caf78bb5b2112 (patch)
treea28bf79400409adbbe4a295aa9a2bf8b473ae865
parenta71e6c5c13b9b8d8fe6037ee3997252fdc0001ec (diff)
ok, skia on linux actually really needs -DSK_R32_SHIFT=16
Otherwise the RGB order is swapped. Interestingly SkSurface::makeImageSnapshot() then returns the non-native 32bit format, but that doesn't seem to actually matter. Change-Id: I5ab2f339e1a8d3a73bf0a76c640051e0e96e5d59
-rw-r--r--external/skia/Library_skia.mk1
-rw-r--r--vcl/skia/salbmp.cxx1
2 files changed, 1 insertions, 1 deletions
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index 6fde1684de44..60eb173f9628 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_Library_use_system_win32_libs,skia,\
else
$(eval $(call gb_Library_add_defs,skia,\
-DSK_BUILD_FOR_UNIX \
+ -DSK_R32_SHIFT=16 \
))
# TODO
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 332a5972bab2..b066569e1a45 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -45,7 +45,6 @@ static bool isValidBitCount(sal_uInt16 nBitCount)
SkiaSalBitmap::SkiaSalBitmap(const SkImage& image)
{
- assert(image.colorType() == kN32_SkColorType);
if (Create(Size(image.width(), image.height()), 32, BitmapPalette()))
{
SkCanvas canvas(mBitmap);