[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - canvas/source

[Libreoffice Gerrit user]

 canvas/source/directx/dx_canvasbitmap.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7baa0738c725959a293966b73efc7787bea40958
Author:     Michael Stahl <mstahl at redhat.com>
AuthorDate: Tue Jul 24 01:18:38 2018 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Jul 24 01:19:24 2018 +0200

    canvas: error C2397: conversion from 'size_t' to 'BYTE' requires ...
    
    a narrowing conversion (at least other people's MSVC says so, mine
    doesn't complain)
    
    (cherry picked from commit f2d039f67743c7588df5cfd725915627b6efb0ba)
    
    Conflicts:
            canvas/source/directx/dx_canvasbitmap.cxx
            (unrelated en passant fix in 8fe0733b45c161a36fc92da488f9bf72ebfd3bbb)
    
    Change-Id: Ic87da76567778884b81361067075fd9325e2d276

diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx
index 81e830d0863e..35877ddb639b 100644
--- a/canvas/source/directx/dx_canvasbitmap.cxx
+++ b/canvas/source/directx/dx_canvasbitmap.cxx
@@ -68,7 +68,8 @@ namespace dxcanvas
             {
                 // this here fills palette with grey level colors, starting
                 // from 0,0,0 up to 255,255,255
-                bmiColors[i] = { (byte)i, (byte)i, (byte)i, (byte)i };
+                BYTE const b(i);
+                bmiColors[i] = { b,b,b,b };
             }
         }
     };