[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/win

Miklos Vajna (via logerrit) logerrit at kemper.freedesktop.org
Wed May 8 08:06:13 UTC 2019


 vcl/win/gdi/DWriteTextRenderer.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit d1eede74b04dd12861b0e2a44c5e89d3c34260c5
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon May 6 16:44:56 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Wed May 8 10:05:32 2019 +0200

    Related: tdf#114209 vcl DirectWrite rotation: don't truncate to int degrees
    
    Pointed out in the post-commit review of
    <https://gerrit.libreoffice.org/71592>, thanks Mike.
    
    Change-Id: I49006e041a5110e995af44b7437ba0b48c4c860d
    Reviewed-on: https://gerrit.libreoffice.org/71868
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit e9813126b7648b735d2231a703190ee48b8bbe42)
    Reviewed-on: https://gerrit.libreoffice.org/71895
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx b/vcl/win/gdi/DWriteTextRenderer.cxx
index c068d15676a5..3a43910d26ff 100644
--- a/vcl/win/gdi/DWriteTextRenderer.cxx
+++ b/vcl/win/gdi/DWriteTextRenderer.cxx
@@ -440,8 +440,9 @@ WinFontTransformGuard::WinFontTransformGuard(ID2D1RenderTarget* pRenderTarget, f
     {
         // DWrite angle is in clockwise degrees, our orientation is in counter-clockwise 10th
         // degrees.
-        aTransform
-            = aTransform * D2D1::Matrix3x2F::Rotation(-rLayout.GetOrientation() / 10, rBaseline);
+        aTransform = aTransform
+                     * D2D1::Matrix3x2F::Rotation(
+                           -static_cast<FLOAT>(rLayout.GetOrientation()) / 10, rBaseline);
     }
     mpRenderTarget->SetTransform(aTransform);
 }


More information about the Libreoffice-commits mailing list