diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2016-03-14 23:43:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-15 09:29:45 +0000 |
| commit | 34a7b51ea482d4487d4fb8e61cde18aa1ff9b8ff (patch) | |
| tree | 644aff2e691d998714e2de0a220fe3d2cb87a1ac | |
| parent | fe0d47bc77742ba830e07d036e4fef8154f8a185 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index 58d0855be6e2..9d0e9a4e295d 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); |