vcl/win/source/gdi/winlayout.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 34a7b51ea482d4487d4fb8e61cde18aa1ff9b8ff Author: Michael Meeks <michael.me...@collabora.com> Date: Mon Mar 14 23:43:02 2016 +0000 win: tinderbox band-aid for compilers that can't infer this type. Change-Id: Ie695a0ca3cdaa7c2b5cd0db9eaa1016aaa5c18a8 Reviewed-on: https://gerrit.libreoffice.org/23252 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 58d0855..9d0e9a4 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -3907,7 +3907,7 @@ 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; + for (size_t nGlyphs = std::min(pGidEnd - pGid, MAX_GLYPHS); pGid != pGidEnd; pGid += nGlyphs, nGlyphs = std::min(pGidEnd - pGid, MAX_GLYPHS)) { std::copy(pGid, pGidEnd, glyphIndices);
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits