From 53f645a9c959d93bde9230862c415c4ab2e3817b Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Tue, 15 Mar 2016 23:38:33 +0100 Subject: fix windows build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 34a7b51ea482d4487d4fb8e61cde18aa1ff9b8ff (for 5-1) auto → size_t made 32bit happy, but win64bit still failed with: error C2784: ´_Ty std::min(std::initializer_list<_Elem>,_Pr)´ : could not deduce template argument for ´std::initializer_list<_Elem>´ from ´__int64´ Change-Id: Ib44840f692f1bcdea90decfe443c6eb72806002a --- vcl/win/gdi/winlayout.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vcl/win/gdi') diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index a5ca8e585a62..fa16339ba3d9 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -3955,8 +3955,8 @@ bool D2DWriteTextOutRenderer::DrawGlyphs(const Point & origin, uint16_t * pGid, DWRITE_GLYPH_OFFSET glyphOffsets[MAX_GLYPHS] = { { 0.0f, 0.0f }, }; mpRT->BeginDraw(); - for (auto nGlyphs = std::min(pGidEnd - pGid, MAX_GLYPHS); pGid != pGidEnd; - pGid += nGlyphs, nGlyphs = std::min(pGidEnd - pGid, MAX_GLYPHS)) + for (size_t nGlyphs = std::min(static_cast(pGidEnd - pGid), MAX_GLYPHS); pGid != pGidEnd; + pGid += nGlyphs, nGlyphs = std::min(static_cast(pGidEnd - pGid), MAX_GLYPHS)) { std::copy(pGid, pGidEnd, glyphIndices); std::copy_n(pAdvances, nGlyphs, glyphAdvances); -- cgit