[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - vcl/headless vcl/quartz

[Luboš Luňák (via logerrit)]

 vcl/headless/svpgdi.cxx            |    2 +-
 vcl/quartz/AquaGraphicsBackend.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit db7426fa13faf7a36cacc713ff0424a7cf14949f
Author:     Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Tue Feb 1 11:19:11 2022 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Feb 3 10:12:49 2022 +0100

    fix std::min() used instead of std::max()
    
    In 534fc16a9f8cd01bb88485e2cf6b9cd33aed3745 I got this backwards,
    if the value is not supposed to be 0, then it should be at least
    the small value, not at most.
    
    Change-Id: Ic55d2b2402985d26e77be0d1605b9ba5985b5ac7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129277
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129325
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 874a5ec4871e..6041678c15c3 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1584,7 +1584,7 @@ bool SvpSalGraphics::drawPolyLine(
     }
 
     // convert miter minimum angle to miter limit
-    double fMiterLimit = 1.0 / sin(std::min(fMiterMinimumAngle, 0.01 * M_PI) / 
2.0);
+    double fMiterLimit = 1.0 / sin(std::max(fMiterMinimumAngle, 0.01 * M_PI) / 
2.0);
 
     // setup cap attribute
     cairo_line_cap_t eCairoLineCap(CAIRO_LINE_CAP_BUTT);
diff --git a/vcl/quartz/AquaGraphicsBackend.cxx 
b/vcl/quartz/AquaGraphicsBackend.cxx
index 140b46ba171c..6436e14c2f65 100644
--- a/vcl/quartz/AquaGraphicsBackend.cxx
+++ b/vcl/quartz/AquaGraphicsBackend.cxx
@@ -820,7 +820,7 @@ bool AquaGraphicsBackend::drawPolyLine(const 
basegfx::B2DHomMatrix& rObjectToDev
             break;
     }
     // convert miter minimum angle to miter limit
-    CGFloat fCGMiterLimit = 1.0 / sin(std::min(fMiterMinimumAngle, 0.01 * 
M_PI) / 2.0);
+    CGFloat fCGMiterLimit = 1.0 / sin(std::max(fMiterMinimumAngle, 0.01 * 
M_PI) / 2.0);
     // setup cap attribute
     CGLineCap aCGLineCap(kCGLineCapButt);