vcl/win/gdi/DWriteTextRenderer.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
New commits: commit 092ec538045f443dce3e45ff73064eb46d0a4fc0 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Fri Nov 27 11:10:56 2020 +0100 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Fri Nov 27 14:26:58 2020 +0100 DWRITE_GLYPH_METRICS members are of INT32 and UINT32 types Change-Id: Ie09e0150bf73efd552e3a3b455ffc395d6b6370c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106754 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx b/vcl/win/gdi/DWriteTextRenderer.cxx index 185925ae7967..abf9be7d5f86 100644 --- a/vcl/win/gdi/DWriteTextRenderer.cxx +++ b/vcl/win/gdi/DWriteTextRenderer.cxx @@ -349,10 +349,10 @@ std::vector<tools::Rectangle> D2DWriteTextOutRenderer::GetGlyphInkBoxes(uint16_t auto pOut = aOut.begin(); for (auto &m : metrics) { - const long left = m.leftSideBearing, - top = m.topSideBearing - m.verticalOriginY, - right = m.advanceWidth - m.rightSideBearing, - bottom = INT32(m.advanceHeight) - m.verticalOriginY - m.bottomSideBearing; + const auto left = m.leftSideBearing; + const auto top = m.topSideBearing - m.verticalOriginY; + const auto right = m.advanceWidth - m.rightSideBearing; + const auto bottom = INT32(m.advanceHeight) - m.verticalOriginY - m.bottomSideBearing; // Scale to screen space. pOut->SetLeft( std::floor(left * mlfEmHeight / aFontMetrics.designUnitsPerEm) ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits