[Libreoffice-commits] core.git: compilerplugins/clang config_host/config_skia.h.in

[Luboš Luňák (via logerrit)]

 compilerplugins/clang/unnecessaryoverride.cxx |    6 ++++++
 config_host/config_skia.h.in                  |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 3f362beeda762e2b122ca9c3978852ef162cc046
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sun Jan 26 21:41:01 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Jan 27 16:35:57 2020 +0100

    disable 32bpp bitmap usage for Skia again
    
    The code is just not ready for 32bpp bitmaps that actually include
    alpha directly in the data instead of the stupid VCL way of using
    a separate bitmap for that. And it seems the performance difference
    is not that large, so revert and maybe somewhen later.
    
    Change-Id: Icb61663665c843fb426206967d0fe7667ed88477
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87466
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/compilerplugins/clang/unnecessaryoverride.cxx b/compilerplugins/clang/unnecessaryoverride.cxx
index e36e5c67a4e8..1ad521a17571 100644
--- a/compilerplugins/clang/unnecessaryoverride.cxx
+++ b/compilerplugins/clang/unnecessaryoverride.cxx
@@ -17,6 +17,7 @@
 
 #include <clang/AST/CXXInheritance.h>
 #include "plugin.hxx"
+#include "check.hxx"
 
 /**
 look for methods where all they do is call their superclass method
@@ -245,6 +246,11 @@ bool UnnecessaryOverride::VisitCXXMethodDecl(const CXXMethodDecl* methodDecl)
         return true;
     }
 
+    auto fdc = loplugin::DeclCheck(methodDecl);
+    // Has code only in #ifdef.
+    if (fdc.Function("GetBackendCapabilities").Class("X11SalInstance").GlobalNamespace())
+        return true;
+
     // If overriding more than one base member function, or one base member
     // function that is available in multiple (non-virtual) base class
     // instances, then this is a disambiguating override:
diff --git a/config_host/config_skia.h.in b/config_host/config_skia.h.in
index 1a8b64a1dfd6..e31d23ad443e 100644
--- a/config_host/config_skia.h.in
+++ b/config_host/config_skia.h.in
@@ -21,8 +21,8 @@ are the same.
 // So ultimately the 24+8 split should be dumped (preferably in all of LO,
 // not just the Skia-related code), but until all of LO works correctly
 // with 32bpp disabling this will avoid such breakages.
-#define SKIA_USE_BITMAP32 1
-//#define SKIA_USE_BITMAP32 0
+//#define SKIA_USE_BITMAP32 1
+#define SKIA_USE_BITMAP32 0
 
 
 /* TODO SKIA check all these */