vcl/win/gdi/winlayout.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 526790bc2386520a4644a1c8e72e84cd4f10c42f Author: Tomofumi Yagi <[email protected]> Date: Sat Mar 19 13:29:44 2016 +0900 fix windows 64bit build on vs2015 Visual Studio 2015 will report as follows at the time of 64bit build. /core/vcl/win/gdi/winlayout.cxx(3972): error C2397: conversion from 'long' to 'FLOAT' requires a narrowing. Change-Id: I1a96bd9244c693a3d41b4bf4c2df80ad3b106adc Reviewed-on: https://gerrit.libreoffice.org/23367 Tested-by: Jenkins <[email protected]> Reviewed-by: jan iversen <[email protected]> diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 572f6a9..e073a01 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -3967,7 +3967,9 @@ bool D2DWriteTextOutRenderer::DrawGlyphs(const Point & origin, uint16_t * pGid, { std::copy(pGid, pGidEnd, glyphIndices); std::copy_n(pAdvances, nGlyphs, glyphAdvances); - std::transform(pOffsets, pOffsets + nGlyphs, glyphOffsets, [](Point &o) { return DWRITE_GLYPH_OFFSET{ o.X(), o.Y() }; }); + std::transform(pOffsets, pOffsets + nGlyphs, + glyphOffsets, + [](Point &o) { return DWRITE_GLYPH_OFFSET{static_cast<FLOAT>(o.X()), static_cast<FLOAT>(o.Y()) }; }); D2D1_POINT_2F baseline = { origin.X() - bounds.Left(), origin.Y() - bounds.Top() }; DWRITE_GLYPH_RUN glyphs = { mpFontFace, _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
