[Libreoffice-commits] core.git: include/tools

[Noel Grandin (via logerrit)]

 include/tools/color.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 964c70e7e1b193432f6677d0fab589d47313d9c5
Author:     Noel Grandin <noel at peralex.com>
AuthorDate: Tue Feb 23 14:59:38 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Feb 24 07:25:57 2021 +0100

    fix tools::Color(ColorAlpha.. constructor
    
    broken since
        commit 63a68064bb33f180b8a231f7524d99405d910226
        Date:   Fri Jan 15 14:49:12 2021 +0200
        make the Color constructors explicitly specify transparency
    
    Change-Id: I0aaee969fc7f11688c52d19357273f9c38d4ee01
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111396
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/tools/color.hxx b/include/tools/color.hxx
index cd472fd472ee..59ac4381de03 100644
--- a/include/tools/color.hxx
+++ b/include/tools/color.hxx
@@ -90,7 +90,7 @@ public:
     }
 
     constexpr Color(enum ColorAlphaTag, sal_uInt32 nColor)
-        : mValue((nColor & 0xffffff) | (255 - (nColor >> 24)))
+        : mValue((nColor & 0xffffff) | ((255 - (nColor >> 24)) << 24))
     {
     }