[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/headless

[Tor Lillqvist (via logerrit)]

 vcl/headless/svpinst.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 69836e982db815720a7b29bc0f2ff2485fc00f1b
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Jul 16 10:38:18 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Jul 16 11:19:00 2020 +0200

    tdf#134832: Don't set mbSupportsBitmap32 on iOS
    
    Our Quartz code sure doesn't handle such bitmaps, as far as I know.
    
    (Yeah, iOS itself of course handles such bitmaps with included alpha
    (both the venerable Core Graphics stuff, not to mention all kinds of
    more modern things), but not our code.)
    
    This does not fix the bug in question, but clearly setting
    mbSupportsBitmap32 for iOS was unintentional. (It is possible that it
    would be relatively easy to just fix our Quartz code to actually
    handle such bitmaps. Then mbSupportsBitmap32 could be turned on again.
    Later.)
    
    Change-Id: I278a4c1ad1c3e882a769d9d054f3f19e1a976666
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98881
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index ff2d1f8763b1..0e40fbe0c70e 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -569,7 +569,9 @@ void SvpSalInstance::AddToRecentDocumentList(const OUString&, const OUString&, c
 std::shared_ptr<vcl::BackendCapabilities> SvpSalInstance::GetBackendCapabilities()
 {
     auto pBackendCapabilities = SalInstance::GetBackendCapabilities();
+#ifndef IOS
     pBackendCapabilities->mbSupportsBitmap32 = true;
+#endif
     return pBackendCapabilities;
 }