[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - canvas/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jul 23 22:56:14 UTC 2018
canvas/source/directx/dx_canvasbitmap.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a92e1e04ecfd04d799703f7daf66a8338c7326bc
Author: Michael Stahl <mstahl at redhat.com>
AuthorDate: Thu May 26 20:34:09 2016 +0200
Commit: Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Jul 24 00:55:21 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)
Change-Id: Ic87da76567778884b81361067075fd9325e2d276
(cherry picked from commit f2d039f67743c7588df5cfd725915627b6efb0ba)
diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx
index e2e249a9da47..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] = { i,i,i,i };
+ BYTE const b(i);
+ bmiColors[i] = { b,b,b,b };
}
}
};
More information about the Libreoffice-commits
mailing list